diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-08 19:03:03 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-08 19:03:03 +0100 |
| commit | d0ecb44dd459164d9d6e7a126024dc3c961a12ed (patch) | |
| tree | 9e56859902d03154cba2b49e779d2429870f9950 /include/uapi | |
| parent | 1dab1345d885819a3a0d5d08ce0b5c2e12c65343 (diff) | |
| parent | c6e5f166373a20a433c38a34bd16f2b62bd0864c (diff) | |
| download | op-kernel-dev-d0ecb44dd459164d9d6e7a126024dc3c961a12ed.zip op-kernel-dev-d0ecb44dd459164d9d6e7a126024dc3c961a12ed.tar.gz | |
Merge tag 'kvm-s390-next-4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Feature and fix for 4.5
- allow the runtime instrumentation support inside the guests
- remove a useless memory barrier
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 6e32f75..9da9051 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -849,6 +849,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_SPLIT_IRQCHIP 121 #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122 #define KVM_CAP_HYPERV_SYNIC 123 +#define KVM_CAP_S390_RI 124 #ifdef KVM_CAP_IRQ_ROUTING |
