diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-21 14:04:41 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-21 14:04:41 -0400 |
| commit | 123857a705603a1d10d2adc02e9dcd065b0e1cb1 (patch) | |
| tree | 0b557c8b24c2fe2f771a2858d0fb84636f85d277 /include/uapi/linux | |
| parent | 085e68eeafbf76e21848ad5bafaecec88a11dd64 (diff) | |
| parent | 66feed61cdf6ee65fd551d3460b1efba6bee55b8 (diff) | |
Merge tag 'signed-kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into kvm-master
Patch queue for ppc - 2015-04-21
This is the latest queue for KVM on PowerPC changes. Highlights this
time around:
- Book3S HV: Debugging aids
- Book3S HV: Minor performance improvements
- Book3S HV: Cleanups
Diffstat (limited to 'include/uapi/linux')
| -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 f574d7be7631..4b60056776d1 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h | |||
| @@ -813,6 +813,7 @@ struct kvm_ppc_smmu_info { | |||
| 813 | #define KVM_CAP_MIPS_MSA 112 | 813 | #define KVM_CAP_MIPS_MSA 112 |
| 814 | #define KVM_CAP_S390_INJECT_IRQ 113 | 814 | #define KVM_CAP_S390_INJECT_IRQ 113 |
| 815 | #define KVM_CAP_S390_IRQ_STATE 114 | 815 | #define KVM_CAP_S390_IRQ_STATE 114 |
| 816 | #define KVM_CAP_PPC_HWRNG 115 | ||
| 816 | 817 | ||
| 817 | #ifdef KVM_CAP_IRQ_ROUTING | 818 | #ifdef KVM_CAP_IRQ_ROUTING |
| 818 | 819 | ||