diff options
| author | Jisheng Zhang <jszhang@marvell.com> | 2016-04-28 10:52:44 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-05-05 20:02:09 +0200 |
| commit | 953efb2b86cfdad340965222389122cc81cba76e (patch) | |
| tree | 45a7aff01f1c16c4adc74e80d63e81b42398108c /arch/arm/kernel/reboot.c | |
| parent | ARM: 8557/1: specify install, zinstall, and uinstall as PHONY targets (diff) | |
| download | linux-953efb2b86cfdad340965222389122cc81cba76e.tar.xz linux-953efb2b86cfdad340965222389122cc81cba76e.zip | |
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>
Diffstat (limited to 'arch/arm/kernel/reboot.c')
| -rw-r--r-- | arch/arm/kernel/reboot.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c index 71a2ff9ec490..3fa867a2aae6 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); } |