Merge branch 'merge-fixes' into devel

1 files changed, 7 insertions, 2 deletions

diff --git a/include/asm-x86/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h
index ae9841319094..e4b29ba37de6 100644
--- a/include/asm-x86/mach-default/mach_apicdef.h
+++ b/include/asm-x86/mach-default/mach_apicdef.h
@@ -3,10 +3,14 @@
 
 #include <asm/apic.h>
 
+#ifdef CONFIG_X86_64
+#define APIC_ID_MASK            (0xFFu<<24)
+#define GET_APIC_ID(x)          (((x)>>24)&0xFFu)
+#define SET_APIC_ID(x)          (((x)<<24))
+#else
 #define         APIC_ID_MASK            (0xF<<24)
-
 static inline unsigned get_apic_id(unsigned long x) 
-{ 
+{
         unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
         if (APIC_XAPIC(ver))
                 return (((x)>>24)&0xFF);
@@ -15,5 +19,6 @@ static inline unsigned get_apic_id(unsigned long x)
 } 
 
 #define         GET_APIC_ID(x)  get_apic_id(x)
+#endif
 
 #endif