Commit 08bf1a27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cfd230b3 e881bfaf

arch/powerpc/kvm/book3s_hv_nested.c

+1 −1
Original line number Diff line number Diff line
@@ -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