diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-05-13 13:27:12 -0400 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2019-12-31 13:50:56 +0900 |
| commit | 374fdfa3d9428a8cb966607650c343fc676ee912 (patch) | |
| tree | f67797cc3c3be548985bf4e200a3293c07550ba3 /tools | |
| parent | eb74b657fb77d133f35bc96e5eacd7a233b02f8f (diff) | |
| download | linux-rpi3-374fdfa3d9428a8cb966607650c343fc676ee912.tar.gz linux-rpi3-374fdfa3d9428a8cb966607650c343fc676ee912.tar.bz2 linux-rpi3-374fdfa3d9428a8cb966607650c343fc676ee912.zip | |
tools arch uapi: Sync the x86 kvm.h copy
To get the changes in:
59073aaf6de0 ("kvm: x86: Add exception payload fields to kvm_vcpu_events")
This silences the following perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h'
diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
The changes in this file are in something not used at this time in any
tools/perf/ tool.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lkml.kernel.org/n/tip-6uh8tpraons0h22dmxgfyony@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[sw0312.kim: cherry-pick mainline commit f98f10f35257 for perf build]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: If00ae735efa27c7bad8a1f2cd5893b919cfc809d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/arch/x86/include/uapi/asm/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/arch/x86/include/uapi/asm/kvm.h b/tools/arch/x86/include/uapi/asm/kvm.h index fd23d5778ea1..f1645578d9d0 100644 --- a/tools/arch/x86/include/uapi/asm/kvm.h +++ b/tools/arch/x86/include/uapi/asm/kvm.h @@ -378,6 +378,7 @@ struct kvm_sync_regs { #define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0) #define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) #define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) +#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) #define KVM_STATE_NESTED_GUEST_MODE 0x00000001 #define KVM_STATE_NESTED_RUN_PENDING 0x00000002 |