diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-30 08:51:40 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-30 08:51:40 -0400 |
| commit | 53ea2e462e1b5b898d244bb113993df709107e32 (patch) | |
| tree | 6ed864c3915eb9f2595e9103926bb94c3e92e1c8 /include/uapi/linux | |
| parent | ee1a725f449d6e631405755f16f3c60c49e8fec5 (diff) | |
| parent | d8d164a9850d486cc48081c18831680254688d0f (diff) | |
Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-next
Patch queue for ppc - 2014-05-30
In this round we have a few nice gems. PR KVM gains initial POWER8 support
as well as LE host awareness, ihe e500 targets can now properly run u-boot,
LE guests now work with PR KVM including KVM hypercalls and HV KVM guests
can now use huge pages.
On top of this there are some bug fixes.
Conflicts:
include/uapi/linux/kvm.h
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 32cf446f1911..e11d8f170a62 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h | |||
| @@ -757,6 +757,7 @@ struct kvm_ppc_smmu_info { | |||
| 757 | #define KVM_CAP_IOEVENTFD_NO_LENGTH 100 | 757 | #define KVM_CAP_IOEVENTFD_NO_LENGTH 100 |
| 758 | #define KVM_CAP_VM_ATTRIBUTES 101 | 758 | #define KVM_CAP_VM_ATTRIBUTES 101 |
| 759 | #define KVM_CAP_ARM_PSCI_0_2 102 | 759 | #define KVM_CAP_ARM_PSCI_0_2 102 |
| 760 | #define KVM_CAP_PPC_FIXUP_HCALL 103 | ||
| 760 | 761 | ||
| 761 | #ifdef KVM_CAP_IRQ_ROUTING | 762 | #ifdef KVM_CAP_IRQ_ROUTING |
| 762 | 763 | ||