diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
| commit | 3f986eefc89c528bf2d398a6dc3637b743a7139e (patch) | |
| tree | 8a0b4ccffa3502b7907f6ce5ed50b7ca0092e5ee /tools/include | |
| parent | Merge tag 'perf-core-for-mingo-4.17-20180305' of git://git.kernel.org/pub/scm... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo-4.16-20180306' of git://git.kernel.org/pub/s... (diff) | |
| download | linux-3f986eefc89c528bf2d398a6dc3637b743a7139e.tar.xz linux-3f986eefc89c528bf2d398a6dc3637b743a7139e.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
tools/perf/perf.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 0fb5ef939732..7b26d4b0b052 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { #define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07 #define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08 #define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2) +#define KVM_GET_MSR_FEATURE_INDEX_LIST _IOWR(KVMIO, 0x0a, struct kvm_msr_list) /* * Extension capability list. @@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_S390_AIS_MIGRATION 150 #define KVM_CAP_PPC_GET_CPU_CHAR 151 #define KVM_CAP_S390_BPB 152 +#define KVM_CAP_GET_MSR_FEATURES 153 #ifdef KVM_CAP_IRQ_ROUTING |