diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-29 05:24:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 13:26:20 -0400 |
| commit | cc57637b0b015fb5d70dbbec740de516d33af07d (patch) | |
| tree | eafbfdf6e058194b46f0fe8dcb0e0c5de5b6fd6d /mm | |
| parent | 81b0c8713385ce1b1b9058e916edcf9561ad76d6 (diff) | |
[PATCH] 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 <y-goto@jp.fujitsu.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index e76c023eb0bb..83917291d459 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME | |||
| 115 | # eventually, we can have this option just 'select SPARSEMEM' | 115 | # eventually, we can have this option just 'select SPARSEMEM' |
| 116 | config MEMORY_HOTPLUG | 116 | config MEMORY_HOTPLUG |
| 117 | bool "Allow for memory hot-add" | 117 | bool "Allow for memory hot-add" |
| 118 | depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND | 118 | depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG |
| 119 | depends on (IA64 || X86 || PPC64) | 119 | depends on (IA64 || X86 || PPC64) |
| 120 | 120 | ||
| 121 | comment "Memory hotplug is currently incompatible with Software Suspend" | 121 | comment "Memory hotplug is currently incompatible with Software Suspend" |