Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6.git] / arch / x86 / include / asm / apicdef.h

diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 7ddb36ab933b97b7757c0df30732d31d40404c19..3b62da926de949f3f10dbb754499e70c6741f3e4 100644 (file)
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -8,12 +8,14 @@
  * Ingo Molnar <mingo@redhat.com>, 1999, 2000
  */
 
-#define        APIC_DEFAULT_PHYS_BASE  0xfee00000
+#define IO_APIC_DEFAULT_PHYS_BASE      0xfec00000
+#define        APIC_DEFAULT_PHYS_BASE          0xfee00000
 
 #define        APIC_ID         0x20
 
 #define        APIC_LVR        0x30
 #define                APIC_LVR_MASK           0xFF00FF
+#define                APIC_LVR_DIRECTED_EOI   (1 << 24)
 #define                GET_APIC_VERSION(x)     ((x) & 0xFFu)
 #define                GET_APIC_MAXLVT(x)      (((x) >> 16) & 0xFFu)
 #ifdef CONFIG_X86_32
@@ -40,6 +42,7 @@
 #define                APIC_DFR_CLUSTER                0x0FFFFFFFul
 #define                APIC_DFR_FLAT                   0xFFFFFFFFul
 #define        APIC_SPIV       0xF0
+#define                APIC_SPIV_DIRECTED_EOI          (1 << 12)
 #define                APIC_SPIV_FOCUS_DISABLED        (1 << 9)
 #define                APIC_SPIV_APIC_ENABLED          (1 << 8)
 #define        APIC_ISR        0x100