aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 14:25:10 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:00 +0200
commitac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd (patch)
tree3334f6ea6b87d81ddded9e2b27139991afcfb099
parent5733f627498121870b081b7ab73ffba01348f8cd (diff)
x86: provide APIC_INTEGRATED definition for x86_64
it is always integrated, so define as 1. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/apicdef.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h
index 550af7a6f88..b0c6b285c91 100644
--- 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