x86: move apic declarations to mach_apic.h

[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 ae9841319094223e4ba81d09f929841cd5035b5e..e4b29ba37de604894bae11681a9236bd64c041e7 100644 (file)
--- 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