tools uapi x86: Sync vmx.h with the kernel
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 24e45b49eef07814e0507507161cd06f15b8ee1b Gitweb: https://git.kernel.org/tip/24e45b49eef07814e0507507161cd06f15b8ee1b Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 22 Apr 2019 11:54:50 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 2 May 2019 16:00:19 -0400
tools uapi x86: Sync vmx.h with the kernel
To pick up the changes from:
2b27924bb1d4 ("KVM: nVMX: always use early vmcs check when EPT is disabled")
That causes this object in the tools/perf build process to be rebuilt:
CC /tmp/build/perf/arch/x86/util/kvm-stat.o
But it isn't using VMX_ABORT_ prefixed constants, so no change in behaviour.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/vmx.h' differs from latest version at 'arch/x86/include/uapi/asm/vmx.h' diff -u tools/arch/x86/include/uapi/asm/vmx.h arch/x86/include/uapi/asm/vmx.h
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paolo Bonzini <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/x86/include/uapi/asm/vmx.h | 1 + 1 file changed, 1 insertion(+)
tools/arch/x86/include/uapi/asm/vmx.h +1 -0
@@ -146,6 +146,7 @@#define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL 2 +#define VMX_ABORT_VMCS_CORRUPTED 3#define VMX_ABORT_LOAD_HOST_MSR_FAIL 4#endif /* _UAPIVMX_H */