diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-15 18:37:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-15 18:37:07 +0100 |
| commit | c847a9c7139cd500eb1355367c43aba6aef62a71 (patch) | |
| tree | 9e0c7803c202c43e4587ab3848994edb2620d1fa /arch/x86 | |
| parent | fix: crash: IP: __bitmap_intersects+0x48/0x73 (diff) | |
| parent | x86: fix build warning when CONFIG_NUMA not defined. (diff) | |
| download | linux-c847a9c7139cd500eb1355367c43aba6aef62a71.tar.xz linux-c847a9c7139cd500eb1355367c43aba6aef62a71.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4e2f2e0aab27..d0c68e291635 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -192,9 +192,20 @@ extern int __node_distance(int, int); #else /* !CONFIG_NUMA */ -#define numa_node_id() 0 -#define cpu_to_node(cpu) 0 -#define early_cpu_to_node(cpu) 0 +static inline int numa_node_id(void) +{ + return 0; +} + +static inline int cpu_to_node(int cpu) +{ + return 0; +} + +static inline int early_cpu_to_node(int cpu) +{ + return 0; +} static inline const cpumask_t *cpumask_of_node(int node) { |