diff --git a/[refs] b/[refs]
index 08da793abd91..581365d79bc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5733f627498121870b081b7ab73ffba01348f8cd
+refs/heads/master: ac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd
diff --git a/trunk/include/asm-x86/apicdef.h b/trunk/include/asm-x86/apicdef.h
index 550af7a6f88e..b0c6b285c916 100644
--- a/trunk/include/asm-x86/apicdef.h
+++ b/trunk/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