---

yaml --- r: 307896 b: refs/heads/master c: 3b1d9d7 h: refs/heads/master v: v3
git-mirror · May 6, 2012 · 5c6f553 · 5c6f553
1 parent 5d77679
commit 5c6f553
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);