From: Alexander Graf Date: Fri, 9 Dec 2011 14:47:53 +0000 (+0100) Subject: KVM: PPC: Book3s: PR: No irq_disable in vcpu_run X-Git-Tag: v3.4-rc1~59^2~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d33ad328c0025c45f4688a769aeebddc342222c1;p=platform%2Fupstream%2Fkernel-adaptation-pc.git KVM: PPC: Book3s: PR: No irq_disable in vcpu_run Somewhere during merges we ended up from local_irq_enable() foo(); local_irq_disable() to always keeping irqs enabled during that part. However, we now have the following code: foo(); local_irq_disable() which disables interrupts without the surrounding code enabling them again! So let's remove that disable and be happy. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity --- diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 19af2bf..857ecde 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -983,8 +983,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) kvm_guest_exit(); - local_irq_disable(); - current->thread.regs->msr = ext_msr; /* Make sure we save the guest FPU/Altivec/VSX state */