Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...

[cascardo/linux.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 7bcb350..936704f 100644 (file)
--- a/include/asm-x86/mach-default/mach_apicdef.h
+++ b/include/asm-x86/mach-default/mach_apicdef.h
@@ -1,13 +1,24 @@
-#ifndef __ASM_MACH_APICDEF_H
-#define __ASM_MACH_APICDEF_H
+#ifndef ASM_X86__MACH_DEFAULT__MACH_APICDEF_H
+#define ASM_X86__MACH_DEFAULT__MACH_APICDEF_H
 
-#define                APIC_ID_MASK            (0xF<<24)
+#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) 
-{ 
-       return (((x)>>24)&0xF);
+{
+       unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
+       if (APIC_XAPIC(ver))
+               return (((x)>>24)&0xFF);
+       else
+               return (((x)>>24)&0xF);
 } 
 
 #define                GET_APIC_ID(x)  get_apic_id(x)
-
 #endif
+
+#endif /* ASM_X86__MACH_DEFAULT__MACH_APICDEF_H */