From: Chris Wright Date: Fri, 30 Jun 2006 02:22:18 +0000 (-0700) Subject: memory hotplug compile fix X-Git-Tag: v2.6.17.3~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f6422abf6ff4a4bd94b09a4bb497b5de54505b9;p=thirdparty%2Fkernel%2Fstable-queue.git memory hotplug compile fix --- diff --git a/queue-2.6.17/memory-hotplug-solve-config-broken-undefined-reference-to-online_page.patch b/queue-2.6.17/memory-hotplug-solve-config-broken-undefined-reference-to-online_page.patch new file mode 100644 index 00000000000..07de0051aff --- /dev/null +++ b/queue-2.6.17/memory-hotplug-solve-config-broken-undefined-reference-to-online_page.patch @@ -0,0 +1,83 @@ +From cc57637b0b015fb5d70dbbec740de516d33af07d Mon Sep 17 00:00:00 2001 +From: Yasunori Goto +Date: Thu, 29 Jun 2006 02:24:27 -0700 +Subject: memory hotplug: solve config broken: undefined reference to `online_page' + +Memory hotplug code of i386 adds memory to only highmem. So, if +CONFIG_HIGHMEM is not set, CONFIG_MEMORY_HOTPLUG shouldn't be set. +Otherwise, it causes compile error. + +In addition, many architecture can't use memory hotplug feature yet. So, I +introduce CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG. + +Signed-off-by: Yasunori Goto +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +--- + arch/i386/Kconfig | 3 +++ + arch/ia64/Kconfig | 3 +++ + arch/powerpc/Kconfig | 3 +++ + arch/x86_64/Kconfig | 2 ++ + mm/Kconfig | 2 +- + 5 files changed, 12 insertions(+), 1 deletion(-) + +--- linux-2.6.17.2.orig/arch/i386/Kconfig ++++ linux-2.6.17.2/arch/i386/Kconfig +@@ -765,6 +765,9 @@ config HOTPLUG_CPU + + endmenu + ++config ARCH_ENABLE_MEMORY_HOTPLUG ++ def_bool y ++ depends on HIGHMEM + + menu "Power management options (ACPI, APM)" + depends on !X86_VOYAGER +--- linux-2.6.17.2.orig/arch/ia64/Kconfig ++++ linux-2.6.17.2/arch/ia64/Kconfig +@@ -270,6 +270,9 @@ config HOTPLUG_CPU + can be controlled through /sys/devices/system/cpu/cpu#. + Say N if you want to disable CPU hotplug. + ++config ARCH_ENABLE_MEMORY_HOTPLUG ++ def_bool y ++ + config SCHED_SMT + bool "SMT scheduler support" + depends on SMP +--- linux-2.6.17.2.orig/arch/powerpc/Kconfig ++++ linux-2.6.17.2/arch/powerpc/Kconfig +@@ -599,6 +599,9 @@ config HOTPLUG_CPU + + Say N if you are unsure. + ++config ARCH_ENABLE_MEMORY_HOTPLUG ++ def_bool y ++ + config KEXEC + bool "kexec system call (EXPERIMENTAL)" + depends on PPC_MULTIPLATFORM && EXPERIMENTAL +--- linux-2.6.17.2.orig/arch/x86_64/Kconfig ++++ linux-2.6.17.2/arch/x86_64/Kconfig +@@ -369,6 +369,8 @@ config HOTPLUG_CPU + can be controlled through /sys/devices/system/cpu/cpu#. + Say N if you want to disable CPU hotplug. + ++config ARCH_ENABLE_MEMORY_HOTPLUG ++ def_bool y + + config HPET_TIMER + bool +--- linux-2.6.17.2.orig/mm/Kconfig ++++ linux-2.6.17.2/mm/Kconfig +@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME + # eventually, we can have this option just 'select SPARSEMEM' + config MEMORY_HOTPLUG + bool "Allow for memory hot-add" +- depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND ++ depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG + + comment "Memory hotplug is currently incompatible with Software Suspend" + depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 3ff316bf845..8631330ba90 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -2,3 +2,4 @@ xfs-corruption-fix-for-next-stable-release.patch ib-mthca-restore-missing-pci-registers-after-reset.patch x86_64-fix-modular-pc-speaker.patch block-fix-bounce-limit-address-check.patch +memory-hotplug-solve-config-broken-undefined-reference-to-online_page.patch