From 88eaefef0ad227c62df3847c20274b42387e9cd9 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 13 Jul 2012 08:19:34 +0100
Subject: [PATCH] --- yaml --- r: 321099 b: refs/heads/master c:
 98bd8b96b26db3399a48202318dca4aaa2515355 h: refs/heads/master i:   321097:
 b8fd053825417f0d2a44ea4e249012870d22d145   321095:
 1aed6f91a92c5eb6fe4d9e9a852a45b0d0f37773 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/process.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 70325cdc2dfe..e1d022bd3a37 100644
--- 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
index 19c95ea65b2f..693b744fd572 100644
--- 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);
 }