summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-12-09 15:47:53 +0100
committerAvi Kivity <avi@redhat.com>2012-03-05 14:52:28 +0200
commitd33ad328c0025c45f4688a769aeebddc342222c1 (patch)
treea19cbfe239e772d77da6aaebdef0b71bc813a215
parent7d82714d4d1293edc57439c796750310866624b2 (diff)
downloadtalos-op-linux-d33ad328c0025c45f4688a769aeebddc342222c1.tar.gz
talos-op-linux-d33ad328c0025c45f4688a769aeebddc342222c1.zip
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 <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/powerpc/kvm/book3s_pr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 19af2bf2b87d..857ecde0cfdf 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 */
OpenPOWER on IntegriCloud