From 425702b939240df5369ebb27d27ffae8c45ad164 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Wed, 7 Jan 2009 21:37:33 +0530 Subject: [PATCH] --- yaml --- r: 136397 b: refs/heads/master c: af8968abf09fe5984bdd206e54e0eeb1dc1fa29c h: refs/heads/master i: 136395: 6c814d8ea1eb841462e95454334bf352000db8c3 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/cpu.h | 1 + trunk/arch/x86/include/asm/smp.h | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9876b8263cc..0b17bc3c704c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96b89dc6598a50e3aac8e2c6d826ae3795b7d030 +refs/heads/master: af8968abf09fe5984bdd206e54e0eeb1dc1fa29c diff --git a/trunk/arch/x86/include/asm/cpu.h b/trunk/arch/x86/include/asm/cpu.h index 4c16888ffa3f..89edafb93390 100644 --- a/trunk/arch/x86/include/asm/cpu.h +++ b/trunk/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/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h index c92b93594ab3..c975b6f83c68 100644 --- a/trunk/arch/x86/include/asm/smp.h +++ b/trunk/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