x86: provide APIC_INTEGRATED definition for x86_64

it is always integrated, so define as 1.

Signed-off-by: Glauber Costa <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h
index 550af7a6f88e7e935f7553a4005ffd9f2599ca86..b0c6b285c9160307f323f0481aeed604cc4cea91 100644 (file)
--- a/include/asm-x86/apicdef.h
+++ b/include/asm-x86/apicdef.h
@@ -22,7 +22,11 @@
 #define                APIC_LVR_MASK           0xFF00FF
 #define                GET_APIC_VERSION(x)     ((x)&0xFFu)
 #define                GET_APIC_MAXLVT(x)      (((x)>>16)&0xFFu)
-#define                APIC_INTEGRATED(x)      ((x)&0xF0u)
+#ifdef CONFIG_X86_32
+#  define      APIC_INTEGRATED(x)      ((x)&0xF0u)
+#else
+#  define      APIC_INTEGRATED(x)      (1)
+#endif
 #define                APIC_XAPIC(x)           ((x) >= 0x14)
 #define        APIC_TASKPRI    0x80
 #define                APIC_TPRI_MASK          0xFFu