x86: fix smpboot integration
[sfrench/cifs-2.6.git] / include / asm-x86 / mach-default / mach_apicdef.h
index 7b78275e6d33d270608b1480e127614da7472bd3..e4b29ba37de604894bae11681a9236bd64c041e7 100644 (file)
@@ -5,13 +5,12 @@
 
 #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)
-#endif
-
 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);
@@ -20,5 +19,6 @@ static inline unsigned get_apic_id(unsigned long x)
 } 
 
 #define                GET_APIC_ID(x)  get_apic_id(x)
+#endif
 
 #endif