]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
KVM: PPC: Book3s: PR: No irq_disable in vcpu_run
authorAlexander Graf <agraf@suse.de>
Fri, 9 Dec 2011 14:47:53 +0000 (15:47 +0100)
committerAvi Kivity <avi@redhat.com>
Mon, 5 Mar 2012 12:52:28 +0000 (14:52 +0200)
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 <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/powerpc/kvm/book3s_pr.c

index 19af2bf2b87d3c00df1a5f978a788cbefa590299..857ecde0cfdfa9312280dfd14af48cc44ed3342c 100644 (file)
@@ -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 */