diff options
| author | Paul Mackerras | 2018-10-09 07:13:20 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2018-10-09 07:13:20 +0200 |
| commit | 9d67121a4fce20e0f7f127d40cd824fbbf5297dc (patch) | |
| tree | efa49480305a12813bc37f06f233656da127d7cd /arch/powerpc/kvm/powerpc.c | |
| parent | KVM: PPC: Book3S HV: Provide mode where all vCPUs on a core must be the same VM (diff) | |
| parent | KVM: PPC: Book3S HV: Add nested shadow page tables to debugfs (diff) | |
| download | kernel-qcow2-linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.tar.gz kernel-qcow2-linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.tar.xz kernel-qcow2-linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.zip | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code. These commits will be merged both via the KVM tree and the
powerpc tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index eba5756d5b41..1f4b128894a0 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -594,7 +594,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = !!(hv_enabled && radix_enabled()); break; case KVM_CAP_PPC_MMU_HASH_V3: - r = !!(hv_enabled && cpu_has_feature(CPU_FTR_ARCH_300)); + r = !!(hv_enabled && cpu_has_feature(CPU_FTR_ARCH_300) && + cpu_has_feature(CPU_FTR_HVMODE)); break; #endif case KVM_CAP_SYNC_MMU: |