---

yaml --- r: 321099 b: refs/heads/master c: 98bd8b9 h: refs/heads/master i: 321097: b8fd053 321095: 1aed6f9 v: v3
git-mirror · Jul 31, 2012 · 88eaefe · 88eaefe
1 parent 70d4a38
commit 88eaefe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5d5f7daa744b34477c4a12728bde0a1694a1707
+refs/heads/master: 98bd8b96b26db3399a48202318dca4aaa2515355
diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c
@@ -247,6 +247,7 @@ void machine_shutdown(void)
 void machine_halt(void)
 {
 	machine_shutdown();
+	local_irq_disable();
 	while (1);
 }
 
@@ -268,6 +269,7 @@ void machine_restart(char *cmd)
 
 	/* Whoops - the platform was unable to reboot. Tell the user! */
 	printk("Reboot failed -- System halted\n");
+	local_irq_disable();
 	while (1);
 }