diff options
| author | Lee Schermerhorn <Lee.Schermerhorn@hp.com> | 2010-08-09 20:19:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:44:57 -0400 |
| commit | 251060006003b79b788f8ce5a827ee5354a42910 (patch) | |
| tree | eb69ce45bd31ffc0609300afbe0cca2a2cbf2ab1 /arch/ia64/Kconfig | |
| parent | b645bd1286f2fbcd2eb4ab3bed5884f63c42e363 (diff) | |
topology: alternate fix for ia64 tiger_defconfig build breakage
Define stubs for the numa_*_id() generic percpu related functions for
non-NUMA configurations in <asm-generic/topology.h> where the other
non-numa stubs live.
Fixes ia64 !NUMA build breakage -- e.g., tiger_defconfig
Back out now unneeded '#ifndef CONFIG_NUMA' guards from ia64 smpboot.c
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 8711d13cd79f..ba22849ee3ec 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -499,8 +499,7 @@ config USE_PERCPU_NUMA_NODE_ID | |||
| 499 | depends on NUMA | 499 | depends on NUMA |
| 500 | 500 | ||
| 501 | config HAVE_MEMORYLESS_NODES | 501 | config HAVE_MEMORYLESS_NODES |
| 502 | def_bool y | 502 | def_bool NUMA |
| 503 | depends on NUMA | ||
| 504 | 503 | ||
| 505 | config ARCH_PROC_KCORE_TEXT | 504 | config ARCH_PROC_KCORE_TEXT |
| 506 | def_bool y | 505 | def_bool y |