The following commit has been merged in the linux branch: commit ed84a07a124bf3b1aab2fd7fdb6e9534838087ac Author: Kumar Gala galak@kernel.crashing.org Date: Fri Oct 16 07:21:36 2009 +0000
powerpc: Limit memory hotplug support to PPC64 Book-3S machines
Signed-off-by: Kumar Gala galak@kernel.crashing.org Signed-off-by: Benjamin Herrenschmidt benh@kernel.crashing.org
diff --git a/mm/Kconfig b/mm/Kconfig index 57963c6..7ca3777 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -129,7 +129,7 @@ config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA depends on HOTPLUG && !(HIBERNATION && !S390) && ARCH_ENABLE_MEMORY_HOTPLUG - depends on (IA64 || X86 || PPC64 || SUPERH || S390) + depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390)
comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && HIBERNATION && !S390