diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-27 17:58:14 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-27 17:58:14 +0400 |
| commit | 04092204bb66c4f8e17465eeee64357dd2ad2585 (patch) | |
| tree | 16e62ff55ac394af5d2e6adb4950533578a20ce1 /arch/arm/kvm/arm.c | |
| parent | 9b88ae99d2fe11e359b3b3992aff953e28b0b43a (diff) | |
| parent | 1252b3313642c3d0dff5b951b625468bf0dcd059 (diff) | |
| download | linux-04092204bb66c4f8e17465eeee64357dd2ad2585.tar.xz | |
Merge tag 'kvm-arm-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
Changed for the 3.16 merge window.
This includes KVM support for PSCI v0.2 and also includes generic Linux
support for PSCI v0.2 (on hosts that advertise that feature via their
DT), since the latter depends on headers introduced by the former.
Finally there's a small patch from Marc that enables Cortex-A53 support.
Diffstat (limited to 'arch/arm/kvm/arm.c')
| -rw-r--r-- | arch/arm/kvm/arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index f0e50a0f3a65..3c82b37c0f9e 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -197,6 +197,7 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: case KVM_CAP_ONE_REG: case KVM_CAP_ARM_PSCI: + case KVM_CAP_ARM_PSCI_0_2: r = 1; break; case KVM_CAP_COALESCED_MMIO: |