lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

topology: alternate fix for ia64 tiger_defconfig build breakage

Browse Source 
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>
This commit is contained in:
Lee Schermerhorn
2010-08-09 17:19:00 -07:00
committed by Linus Torvalds
parent b645bd1286
commit 2510600060
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/topology.h
View File

@ -292,10 +292,6 @@ static inline void set_cpu_numa_mem(int cpu, int node)
#else /* !CONFIG_HAVE_MEMORYLESS_NODES */
static inline void set_numa_mem(int node) {}
static inline void set_cpu_numa_mem(int cpu, int node) {}
#ifndef numa_mem_id
/* Returns the number of the nearest Node with memory */
static inline int numa_mem_id(void)