The patch titled
solve config broken: undefined reference to `online_page'
has been removed from the -mm tree. Its filename is
solve-config-broken-undefined-reference-to-online_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: solve config broken: undefined reference to `online_page'
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
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 <y-goto@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN arch/i386/Kconfig~solve-config-broken-undefined-reference-to-online_page arch/i386/Kconfig
--- a/arch/i386/Kconfig~solve-config-broken-undefined-reference-to-online_page
+++ a/arch/i386/Kconfig
@@ -794,6 +794,9 @@ config COMPAT_VDSO
endmenu
+config ARCH_ENABLE_MEMORY_HOTPLUG
+ def_bool y
+ depends on HIGHMEM
menu "Power management options (ACPI, APM)"
depends on !X86_VOYAGER
diff -puN arch/ia64/Kconfig~solve-config-broken-undefined-reference-to-online_page arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~solve-config-broken-undefined-reference-to-online_page
+++ a/arch/ia64/Kconfig
@@ -271,6 +271,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
diff -puN arch/powerpc/Kconfig~solve-config-broken-undefined-reference-to-online_page arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~solve-config-broken-undefined-reference-to-online_page
+++ a/arch/powerpc/Kconfig
@@ -618,6 +618,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
diff -puN arch/x86_64/Kconfig~solve-config-broken-undefined-reference-to-online_page arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~solve-config-broken-undefined-reference-to-online_page
+++ a/arch/x86_64/Kconfig
@@ -370,6 +370,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
diff -puN mm/Kconfig~solve-config-broken-undefined-reference-to-online_page mm/Kconfig
--- a/mm/Kconfig~solve-config-broken-undefined-reference-to-online_page
+++ a/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
depends on (IA64 || X86 || PPC64)
comment "Memory hotplug is currently incompatible with Software Suspend"
_
Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
