x64, x2apic/intr-remap: introduce read_apic_id() to genapic routines

[linux-2.6-omap-h63xx.git] / include / asm-x86 / mach-default / mach_apicdef.h

diff --git a/include/asm-x86/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h
index e4b29ba37de604894bae11681a9236bd64c041e7..453b58a67e29f095b8c7c525b3bdf407ae523dbf 100644 (file)
--- a/include/asm-x86/mach-default/mach_apicdef.h
+++ b/include/asm-x86/mach-default/mach_apicdef.h
@@ -5,8 +5,9 @@
 
 #ifdef CONFIG_X86_64
 #define        APIC_ID_MASK            (0xFFu<<24)
-#define GET_APIC_ID(x)          (((x)>>24)&0xFFu)
+#define GET_APIC_ID(x)          (x)
 #define        SET_APIC_ID(x)          (((x)<<24))
+#define GET_XAPIC_ID(x)                (((x) >> 24) & 0xFFu)
 #else
 #define                APIC_ID_MASK            (0xF<<24)
 static inline unsigned get_apic_id(unsigned long x)