]> xenbits.xensource.com Git - people/vhanquez/xen.git/commitdiff
x86: machine_halt() forcibly re-enables IRQs as it may be called from
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 12 Jun 2008 17:31:19 +0000 (18:31 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 12 Jun 2008 17:31:19 +0000 (18:31 +0100)
panic() which itself may be called in an IRQ-safe critical section.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset:   17837:a3319f32496fd93a545fc354ce3944072cc32e5e
xen-unstable date:        Thu Jun 12 16:09:08 2008 +0100

xen/arch/x86/shutdown.c

index 760b260bc29266437dab7c91362e13714825cd8f..c94a31a9df5b821ce0e86779c833c36dd0fbb292 100644 (file)
@@ -50,6 +50,7 @@ void machine_halt(void)
 {
     watchdog_disable();
     console_start_sync();
+    local_irq_enable();
     smp_call_function(__machine_halt, NULL, 1, 0);
     __machine_halt(NULL);
 }