diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 09:14:17 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 09:14:17 (GMT) |
| commit | 3eb3963fd1974c63e9bb3cfe774abc3e1995e479 (patch) | |
| tree | c00d6c2e8484793ab6bd0644db59bbdf5e9429c5 /arch/x86/include/asm/topology.h | |
| parent | ae2b56b92bd33b416528986528e0732c98c7a285 (diff) | |
| parent | 5766b842b23c6b40935a5f3bd435b2bcdaff2143 (diff) | |
| download | linux-fsl-qoriq-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.tar.xz | |
Merge branch 'cpus4096' into core/percpu
Conflicts:
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/tlb_32.c
Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/topology.h')
| -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 ffea1fe..10022ed 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -190,9 +190,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) { |