The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 8daf1fb73295b43fb2f624f709449b484532ba64
Gitweb:
https://git.kernel.org/tip/8daf1fb73295b43fb2f624f709449b484532ba64
Author: Arnaldo Carvalho de Melo <a...@redhat.com>
AuthorDate: Tue, 15 Oct 2019 12:35:02 -03:00
Committer: Arnaldo Carvalho de Melo <a...@redhat.com>
CommitterDate: Tue, 15 Oct 2019 12:35:02 -03:00
tools headers kvm: Sync kvm.h headers with the kernel sources
To pick the changes in:
344c6c804703 ("KVM/Hyper-V: Add new KVM capability
KVM_CAP_HYPERV_DIRECT_TLBFLUSH")
dee04eee9182 ("KVM: RISC-V: Add KVM_REG_RISCV for ONE_REG interface")
These trigger the rebuild of this object:
CC /tmp/build/perf/trace/beauty/ioctl.o
But do not result in any change in tooling, as the additions are not
being used in any table generatator.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from
latest version at 'include/uapi/linux/kvm.h'
diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Anup Patel <anup.pa...@wdc.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Paul Walmsley <paul.walms...@sifive.com>
Cc: Tianyu Lan <tianyu....@microsoft.com>
Link: https://lkml.kernel.org/n/tip-d1v48a0qfoe98u5v9tn3m...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
tools/include/uapi/linux/kvm.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index 233efbb..52641d8 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -999,6 +999,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_ARM_PTRAUTH_GENERIC 172
#define KVM_CAP_PMU_EVENT_FILTER 173
#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
+#define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175
#ifdef KVM_CAP_IRQ_ROUTING
@@ -1145,6 +1146,7 @@ struct kvm_dirty_tlb {
#define KVM_REG_S390 0x5000000000000000ULL
#define KVM_REG_ARM64 0x6000000000000000ULL
#define KVM_REG_MIPS 0x7000000000000000ULL
+#define KVM_REG_RISCV 0x8000000000000000ULL
#define KVM_REG_SIZE_SHIFT 52
#define KVM_REG_SIZE_MASK 0x00f0000000000000ULL
