[PATCH v2] ARM: reboot: remove duplicated local_irq_disable()

Jisheng Zhang jszhang at marvell.com
Tue Mar 29 23:45:08 PDT 2016


Once entering machine_halt() and machine_restart(), local_irq_disable()
is called, and local irq is kept disabled, so the local_irq_disable()
at the end of these two functions are not necessary, remove it.

Signed-off-by: Jisheng Zhang <jszhang at marvell.com>
---

Since v1:
 - correct typo in commit msg

 arch/arm/kernel/reboot.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 71a2ff9..3fa867a 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -104,8 +104,6 @@ void machine_halt(void)
 {
 	local_irq_disable();
 	smp_send_stop();
-
-	local_irq_disable();
 	while (1);
 }
 
@@ -150,6 +148,5 @@ 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);
 }
-- 
2.8.0.rc3




More information about the linux-arm-kernel mailing list