From 1add4aae48402aeae90fda8c4764c721f104d8a8 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 21 Sep 2010 19:59:43 +0200
Subject: [PATCH] --- yaml --- r: 210935 b: refs/heads/master c:
 ca242ac9960dc61530e25a2c190e4e13fd5f1ecb h: refs/heads/master i:   210933:
 57806085b94c0bed038b2b0bd32eb92f12c3417f   210931:
 73b19488a5fea9285716989d4e865e6c2b0a379f   210927:
 007807ab1b2b6ec75bc0c89cd8689b91fcd27824 v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0860c34fb9e..dc597626851e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bbfb2653177a00f70e57e53625502d43804fed0
+refs/heads/master: ca242ac9960dc61530e25a2c190e4e13fd5f1ecb
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index d4853a54771a..5186e728c53e 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -1970,10 +1970,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
 
 asmlinkage void kvm_handle_fault_on_reboot(void)
 {
-	if (kvm_rebooting)
+	if (kvm_rebooting) {
 		/* spin while reset goes on */
+		local_irq_enable();
 		while (true)
 			;
+	}
 	/* Fault while not rebooting.  We want the trace. */
 	BUG();
 }