Merge branch 'master' of postpeta.pccluster.org:mckernel

2014-06-25 13:45:46 +09:00
parent 770eae0186 a9bebf1e14
commit dc7f38c8c7
3 changed files with 12 additions and 6 deletions
--- a/arch/x86/kernel/cpu.c
+++ b/arch/x86/kernel/cpu.c
@@ -510,6 +510,11 @@ void cpu_halt(void)
 	asm volatile("hlt");
 }

+void cpu_safe_halt(void)
+{
+    asm volatile("sti; hlt");
+}
+
 void cpu_enable_interrupt(void)
 {
 	asm volatile("sti");