From 655867f0d50753a24c8a176d4a40162d01ee1610 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 9 Dec 2011 15:47:53 +0100
Subject: [PATCH] --- yaml --- r: 297085 b: refs/heads/master c:
 d33ad328c0025c45f4688a769aeebddc342222c1 h: refs/heads/master i:   297083:
 45b10b5fb9db257303a86d5881cb9331b083f1f9 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kvm/book3s_pr.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d7bbc010b1a1..4a259aa37a0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d82714d4d1293edc57439c796750310866624b2
+refs/heads/master: d33ad328c0025c45f4688a769aeebddc342222c1
diff --git a/trunk/arch/powerpc/kvm/book3s_pr.c b/trunk/arch/powerpc/kvm/book3s_pr.c
index 19af2bf2b87d..857ecde0cfdf 100644
--- a/trunk/arch/powerpc/kvm/book3s_pr.c
+++ b/trunk/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 */