diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-03 04:02:53 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-03 04:02:53 (GMT) |
| commit | d177d7df2673ea81e8ee1e3d468398eeb7e580f5 (patch) | |
| tree | 2f9fbc5902d5d3cddae3f3da1bd1bfefc83050cf /arch | |
| parent | 2350bc148253bbd1a6c2c1ca062a6405c40ed0db (diff) | |
| parent | 06b639e5a1a665ba6c959398ea0e6171c162028b (diff) | |
| download | linux-d177d7df2673ea81e8ee1e3d468398eeb7e580f5.tar.xz | |
Merge tag 'v4.9.60' into linux-linaro-lsk-v4.9
This is the 4.9.60 stable release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 70963c8..fc0df0f 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -601,8 +601,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) break; #endif case KVM_CAP_PPC_HTM: - r = cpu_has_feature(CPU_FTR_TM_COMP) && - is_kvmppc_hv_enabled(kvm); + r = cpu_has_feature(CPU_FTR_TM_COMP) && hv_enabled; break; default: r = 0; |