From: Glauber Costa <gcosta@redhat.com>
Date: Thu, 27 Mar 2008 17:05:56 +0000 (-0300)
Subject: x86: surround hard_smp_processor_id in APIC_DEFINITION
X-Git-Tag: v2.6.26-rc1~1154^2~75
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fe874b3edff43f9a74d9903eb3710e5e0511faf1;p=linux-2.6-omap-h63xx.git

x86: surround hard_smp_processor_id in APIC_DEFINITION

APIC_DEFINITION is not defined in x86_64, so in practice, we keep
our old code here. But as a nice side effect, the code is now
equal to smp_32.h.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index c53a011bb91..25206333476 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -52,12 +52,16 @@ static inline int logical_smp_processor_id(void)
 	return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));
 }
 
-#include <mach_apicdef.h>
+# ifdef APIC_DEFINITION
+extern int hard_smp_processor_id(void);
+# else
+#  include <mach_apicdef.h>
 static inline int hard_smp_processor_id(void)
 {
 	/* we don't want to mark this access volatile - bad code generation */
 	return GET_APIC_ID(*(u32 *)(APIC_BASE + APIC_ID));
 }
+# endif /* APIC_DEFINITION */
 
 #endif