# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/02 13:40:30-05:00 len.brown@intel.com # [ACPI] update CONFIG_ACPI_CONTAINER Kconfig help # # Signed-off-by: Keiichiro Tokunaga # Signed-off-by: Andrew Morton # Signed-off-by: Len Brown # # drivers/acpi/Kconfig # 2005/02/17 12:13:31-05:00 len.brown@intel.com +7 -2 # Import patch fix-help-for-acpi_container.patch # Index: linux-2.6.12/drivers/acpi/Kconfig =================================================================== --- linux-2.6.12.orig/drivers/acpi/Kconfig 2005-07-09 23:35:16.000000000 -0400 +++ linux-2.6.12/drivers/acpi/Kconfig 2005-07-09 23:38:24.000000000 -0400 @@ -327,8 +327,13 @@ depends on EXPERIMENTAL default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) ---help--- - This is the ACPI generic container driver which supports - ACPI0004, PNP0A05 and PNP0A06 devices + This allows _physical_ insertion and removal of CPUs and memory. + This can be useful, for example, on NUMA machines that support + ACPI based physical hotplug of nodes, or non-NUMA machines that + support physical cpu/memory hot-plug. + + If one selects "m", this driver can be loaded with + "modprobe acpi_container". config ACPI_HOTPLUG_MEMORY tristate "Memory Hotplug"