From: Jisheng Zhang <jszhang@marvell.com>
Date: Thu, 28 Apr 2016 08:52:44 +0000 (+0100)
Subject: ARM: 8568/1: reboot: remove duplicated local_irq_disable()
X-Git-Tag: v4.7-rc1~109^2^4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953efb2b86cfdad340965222389122cc81cba76e;p=thirdparty%2Fkernel%2Flinux.git

ARM: 8568/1: reboot: remove duplicated local_irq_disable()

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@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 71a2ff9ec4900..3fa867a2aae67 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);
 }