diff options
author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
tree | 30cefbd6f503d20557e24a1765a027687170a7da /arch/x86/include/uapi/asm/vmx.h | |
parent | Linux 3.18-rc1 (diff) | |
parent | powerpc/iommu: Rename iommu_[un]map_sg functions (diff) | |
download | linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.tar.xz linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.zip |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'arch/x86/include/uapi/asm/vmx.h')
-rw-r--r-- | arch/x86/include/uapi/asm/vmx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h index 0e79420376eb..990a2fe1588d 100644 --- a/arch/x86/include/uapi/asm/vmx.h +++ b/arch/x86/include/uapi/asm/vmx.h @@ -67,6 +67,7 @@ #define EXIT_REASON_EPT_MISCONFIG 49 #define EXIT_REASON_INVEPT 50 #define EXIT_REASON_PREEMPTION_TIMER 52 +#define EXIT_REASON_INVVPID 53 #define EXIT_REASON_WBINVD 54 #define EXIT_REASON_XSETBV 55 #define EXIT_REASON_APIC_WRITE 56 @@ -114,6 +115,7 @@ { EXIT_REASON_EOI_INDUCED, "EOI_INDUCED" }, \ { EXIT_REASON_INVALID_STATE, "INVALID_STATE" }, \ { EXIT_REASON_INVD, "INVD" }, \ + { EXIT_REASON_INVVPID, "INVVPID" }, \ { EXIT_REASON_INVPCID, "INVPCID" } #endif /* _UAPIVMX_H */ |