Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e41afa authored by Avi Kivity's avatar Avi Kivity
Browse files

Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6

PPC fix from Alex Graf: "It contains an important bug fix which
can lead to guest freezes when using PAPR guests with PR KVM."

* 'for-upstream-master' of git://github.com/agraf/linux-2.6

:
  powerpc/kvm: Fix "PR" KVM implementation of H_CEDE

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parents a76beb14 1dee7a3d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
	case H_PUT_TCE:
		return kvmppc_h_pr_put_tce(vcpu);
	case H_CEDE:
		vcpu->arch.shared->msr |= MSR_EE;
		kvm_vcpu_block(vcpu);
		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);
		vcpu->stat.halt_wakeup++;