aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 10:56:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 10:56:31 -0700
commit08bf1a27c4c354b853fd81a79e953525bbcc8506 (patch)
tree5e98c5ff6f988a3b2575da1eb2d057a7e1f6401c
parentcfd230b3cfd6f72a6016fb0b319bb63fcc8206cd (diff)
parente881bfaf5a5f409390973e076333281465f2b0d9 (diff)
downloadlinux-stericsson-08bf1a27c4c354b853fd81a79e953525bbcc8506.tar.gz
Merge tag 'powerpc-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman: "One fix for a recent change which broke nested KVM guests on Power9. Thanks to Alexey Kardashevskiy" * tag 'powerpc-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: KVM: PPC: Fix nested guest RC bits update
-rw-r--r--arch/powerpc/kvm/book3s_hv_nested.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 0989751c9d5e..2c849a65db77 100644
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -1233,7 +1233,7 @@ static long kvmhv_handle_nested_set_rc(struct kvm_vcpu *vcpu,
/* Set the rc bit in the pte of the shadow_pgtable for the nest guest */
ret = kvmppc_hv_handle_set_rc(kvm, true, writing,
- n_gpa, gp->shadow_lpid);
+ n_gpa, gp->l1_lpid);
if (!ret)
ret = -EINVAL;
else