diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 17:42:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 17:42:32 +0200 |
| commit | e7654c1e49b8fd79baa8616f601c620013a027c1 (patch) | |
| tree | da8e870c89229624654129fb27b4e53d50fda0e1 /arch | |
| parent | block: fix infinite loop in __getblk_slow (diff) | |
| parent | Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6 (diff) | |
| download | linux-e7654c1e49b8fd79baa8616f601c620013a027c1.tar.xz linux-e7654c1e49b8fd79baa8616f601c620013a027c1.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull a couple of KVM fixes from Avi Kivity:
"One is an adjustment for an irq layer change that affected device
assignment, the other a one-liner ppc fix."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
powerpc/kvm: Fix "PR" KVM implementation of H_CEDE
KVM: Fix device assignment threaded irq handler
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++; |