From 5c6f5534f36c8245ba1bb441e1b306da1613fe02 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 30 Apr 2012 10:56:12 +0200
Subject: [PATCH] --- yaml --- r: 307896 b: refs/heads/master c:
 3b1d9d7d95e7c62518160edebd92450b58c6d55f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fb7b7c4d7282..ddca39e0088c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11f7d6c2d1b17abf7b91e0f2d43bfe9de0b9e5cf
+refs/heads/master: 3b1d9d7d95e7c62518160edebd92450b58c6d55f
diff --git a/trunk/arch/powerpc/kvm/book3s_pr.c b/trunk/arch/powerpc/kvm/book3s_pr.c
index dba282e5093f..d169a0aa4887 100644
--- a/trunk/arch/powerpc/kvm/book3s_pr.c
+++ b/trunk/arch/powerpc/kvm/book3s_pr.c
@@ -548,6 +548,9 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 	run->exit_reason = KVM_EXIT_UNKNOWN;
 	run->ready_for_interrupt_injection = 1;
 
+	/* We get here with MSR.EE=0, so enable it to be a nice citizen */
+	__hard_irq_enable();
+
 	trace_kvm_book3s_exit(exit_nr, vcpu);
 	preempt_enable();
 	kvm_resched(vcpu);