Commit 953efb2b authored Apr 28, 2016 by Jisheng Zhang Committed by Russell King May 05, 2016

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>

parent bc5ce155

arch/arm/kernel/reboot.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}