diff options
author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2009-01-07 21:37:33 +0530 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-07 21:48:26 +0100 |
commit | af8968abf09fe5984bdd206e54e0eeb1dc1fa29c (patch) | |
tree | 8ab210f3d0aea269af8bf18f29aab6e40507c47a | |
parent | 96b89dc6598a50e3aac8e2c6d826ae3795b7d030 (diff) |
x86: smp.h move cpu_physical_id declartion to cpu.h
Impact: cleanup
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/include/asm/cpu.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/smp.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 4c16888ffa3..89edafb9339 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -15,6 +15,7 @@ extern void prefill_possible_map(void); static inline void prefill_possible_map(void) {} +#define cpu_physical_id(cpu) boot_cpu_physical_apicid #define safe_smp_processor_id() 0 #define stack_smp_processor_id() 0 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index c92b93594ab..c975b6f83c6 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -170,8 +170,6 @@ extern int safe_smp_processor_id(void); }) #define safe_smp_processor_id() smp_processor_id() -#else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */ -#define cpu_physical_id(cpu) boot_cpu_physical_apicid #endif #ifdef CONFIG_X86_LOCAL_APIC |