diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-27 05:53:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:36 -0400 |
| commit | 1f04bbd2d396a701c5af2e5b92bad896c2550c16 (patch) | |
| tree | ec84c99b1259361bc0878ebe78f1acadb30dad25 | |
| parent | 2842f11419704f8707fffc82e10d2263427fc130 (diff) | |
[PATCH] sparc64: support sparsemem and !memory hotplug
Fix "undefined reference to `arch_add_memory'" on sparc64 allmodconfig.
sparc64 doesn't support memory hotplug. But we want it to support
sparsemem.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 66e65ab39426..e76c023eb0bb 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -116,6 +116,7 @@ config SPARSEMEM_EXTREME | |||
| 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 |
| 119 | depends on (IA64 || X86 || PPC64) | ||
| 119 | 120 | ||
| 120 | comment "Memory hotplug is currently incompatible with Software Suspend" | 121 | comment "Memory hotplug is currently incompatible with Software Suspend" |
| 121 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND | 122 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND |