]> Zhao Yanbai Git Server - minix.git/commitdiff
Kernel: reenable interrupts before halting
authorThomas Veerman <thomas@minix3.org>
Thu, 18 Oct 2012 10:03:34 +0000 (10:03 +0000)
committerThomas Veerman <thomas@minix3.org>
Tue, 30 Oct 2012 11:32:05 +0000 (11:32 +0000)
kernel/arch/arm/arch_reset.c

index 66232ba093cb1b8c912e079a21f3877a745a0a9b..22cc627066af9d0e54d7c6a2ded1064d9ad29c26 100644 (file)
 #include "direct_utils.h"
 #include <machine/multiboot.h>
 
-void halt_cpu(void)
+void
+halt_cpu(void)
 {
-    asm volatile("dsb");
-    asm volatile("wfi");
+       asm volatile("dsb");
+       asm volatile("cpsie i");
+       asm volatile("wfi");
 }
 
 void
@@ -31,15 +33,17 @@ reset(void)
     while (1);
 }
 
-__dead void arch_shutdown(int how)
+__dead void
+arch_shutdown(int how)
 {
-    while (1);
+       while (1);
 }
 
 #ifdef DEBUG_SERIAL
-void ser_putc(char c)
+void
+ser_putc(char c)
 {
-    omap3_ser_putc(c);
+       omap3_ser_putc(c);
 }
 
 #endif