From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 12 Jun 2008 15:09:08 +0000 (+0100)
Subject: x86: machine_halt() forcibly re-enables IRQs as it may be called from
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~88
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9d59b7d1748d75b8abdf90d0ab5aeaf614135fc;p=xen.git

x86: machine_halt() forcibly re-enables IRQs as it may be called from
panic() which itself may be called in an IRQ-safe critical section.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 6b41e739eb..a65771575f 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -90,6 +90,7 @@ void machine_halt(void)
 {
     watchdog_disable();
     console_start_sync();
+    local_irq_enable();
     smp_call_function(__machine_halt, NULL, 1, 0);
     __machine_halt(NULL);
 }