Skip to content

Commit 25d4e7f

Browse files
committed
tools arch kvm: Sync kvm headers with the kernel sources
To pick up the changes from: 83d31e5 ("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>
1 parent 94fddb7 commit 25d4e7f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

  • tools/arch/x86/include/uapi/asm

tools/arch/x86/include/uapi/asm/kvm.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data {
408408
};
409409

410410
struct kvm_vmx_nested_state_hdr {
411-
__u32 flags;
412411
__u64 vmxon_pa;
413412
__u64 vmcs12_pa;
414-
__u64 preemption_timer_deadline;
415413

416414
struct {
417415
__u16 flags;
418416
} smm;
417+
418+
__u32 flags;
419+
__u64 preemption_timer_deadline;
419420
};
420421

421422
struct kvm_svm_nested_state_data {

0 commit comments

Comments
 (0)