Merge branch 'linus' into x86/boot, to resolve conflict

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

diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
index 0e73616..4dba173 100644 (file)
--- a/arch/x86/include/asm/vmx.h
+++ b/arch/x86/include/asm/vmx.h
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 
 #include <uapi/asm/vmx.h>
+#include <asm/trapnr.h>
 #include <asm/vmxfeatures.h>
 
 #define VMCS_CONTROL_BIT(x)    BIT(VMX_FEATURE_##x & 0x1f)
@@ -374,14 +375,14 @@ enum vmcs_field {
 #define VECTORING_INFO_DELIVER_CODE_MASK       INTR_INFO_DELIVER_CODE_MASK
 #define VECTORING_INFO_VALID_MASK              INTR_INFO_VALID_MASK
 
-#define INTR_TYPE_EXT_INTR              (0 << 8) /* external interrupt */
-#define INTR_TYPE_RESERVED              (1 << 8) /* reserved */
-#define INTR_TYPE_NMI_INTR             (2 << 8) /* NMI */
-#define INTR_TYPE_HARD_EXCEPTION       (3 << 8) /* processor exception */
-#define INTR_TYPE_SOFT_INTR             (4 << 8) /* software interrupt */
-#define INTR_TYPE_PRIV_SW_EXCEPTION    (5 << 8) /* ICE breakpoint - undocumented */
-#define INTR_TYPE_SOFT_EXCEPTION       (6 << 8) /* software exception */
-#define INTR_TYPE_OTHER_EVENT           (7 << 8) /* other event */
+#define INTR_TYPE_EXT_INTR             (EVENT_TYPE_EXTINT << 8)        /* external interrupt */
+#define INTR_TYPE_RESERVED             (EVENT_TYPE_RESERVED << 8)      /* reserved */
+#define INTR_TYPE_NMI_INTR             (EVENT_TYPE_NMI << 8)           /* NMI */
+#define INTR_TYPE_HARD_EXCEPTION       (EVENT_TYPE_HWEXC << 8)         /* processor exception */
+#define INTR_TYPE_SOFT_INTR            (EVENT_TYPE_SWINT << 8)         /* software interrupt */
+#define INTR_TYPE_PRIV_SW_EXCEPTION    (EVENT_TYPE_PRIV_SWEXC << 8)    /* ICE breakpoint */
+#define INTR_TYPE_SOFT_EXCEPTION       (EVENT_TYPE_SWEXC << 8)         /* software exception */
+#define INTR_TYPE_OTHER_EVENT          (EVENT_TYPE_OTHER << 8)         /* other event */
 
 /* GUEST_INTERRUPTIBILITY_INFO flags. */
 #define GUEST_INTR_STATE_STI           0x00000001