diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-17 14:39:16 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-17 14:39:16 +0200 |
| commit | 25d4e7f513d4f8afcf81cb6f00edf1248b0ff8fc (patch) | |
| tree | 5fa2f3718c9179817a4099b980b032891eb1f316 /tools/arch | |
| parent | perf tools: Sync hashmap.h with libbpf's (diff) | |
| download | linux-25d4e7f513d4f8afcf81cb6f00edf1248b0ff8fc.tar.xz linux-25d4e7f513d4f8afcf81cb6f00edf1248b0ff8fc.zip | |
tools arch kvm: Sync kvm headers with the kernel sources
To pick up the changes from:
83d31e5271ac ("KVM: nVMX: fixes for preemption timer migration")
That don't entail changes in tooling.
This silences these tools/perf build warnings:
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
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/arch')
| -rw-r--r-- | tools/arch/x86/include/uapi/asm/kvm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/arch/x86/include/uapi/asm/kvm.h b/tools/arch/x86/include/uapi/asm/kvm.h index 17c5a038f42d..0780f97c1850 100644 --- a/tools/arch/x86/include/uapi/asm/kvm.h +++ b/tools/arch/x86/include/uapi/asm/kvm.h @@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data { }; struct kvm_vmx_nested_state_hdr { - __u32 flags; __u64 vmxon_pa; __u64 vmcs12_pa; - __u64 preemption_timer_deadline; struct { __u16 flags; } smm; + + __u32 flags; + __u64 preemption_timer_deadline; }; struct kvm_svm_nested_state_data { |