diff options
| author | Avi Kivity <avi@redhat.com> | 2012-07-11 17:49:20 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-11 17:49:20 +0200 |
| commit | 37e41afa97307a3e54b200a5c9179ada1632a844 (patch) | |
| tree | 93057758db5a44bd8268191a829e2e1ce1ed162e /arch | |
| parent | KVM: Fix device assignment threaded irq handler (diff) | |
| parent | powerpc/kvm: Fix "PR" KVM implementation of H_CEDE (diff) | |
| download | linux-37e41afa97307a3e54b200a5c9179ada1632a844.tar.xz linux-37e41afa97307a3e54b200a5c9179ada1632a844.zip | |
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: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kvm/book3s_pr_papr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index 3ff9013d6e79..ee02b30878ed 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c @@ -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++; |