diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-09 16:25:22 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-09 16:25:22 +0100 |
| commit | 61d750773df388632b11a6170098e2865977e1f6 (patch) | |
| tree | c74679134fdf619b200ab0fe281dcdb9cfe44fb1 /arch/powerpc/kvm/powerpc.c | |
| parent | f0d438e4fb35244efc035a0c55ef876cc75a0abb (diff) | |
| parent | 432953b4455d8a48af0500a77826c71871671161 (diff) | |
| download | linux-61d750773df388632b11a6170098e2865977e1f6.tar.bz2 | |
Merge tag 'kvm-ppc-next-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Second PPC KVM update for 4.15
This merges in my kvm-ppc-fixes branch to resolve the conflicts
between the fixes that have been applied there and the changes
made in my patch series to allow HPT guests to run on a radix
host on POWER9. It also resolves another conflict in the code
for the KVM_CAP_PPC_HTM capability.
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index a0b7f094de78..6b6c53c42ac9 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -643,7 +643,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) break; #endif case KVM_CAP_PPC_HTM: - r = is_kvmppc_hv_enabled(kvm) && + r = hv_enabled && (cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM_COMP); break; default: |