Remove redundant local_irq_disable() at machine halt and restart. Since commit 44424c34049f ("ARM: 7803/1: Fix deadlock scenario with smp_send_stop()") interrupts are disabled before stopping secondary CPUs.
Signed-off-by: Johan Hovold <jo...@kernel.org> --- arch/arm/kernel/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index a35f6ebbd2c2..5663ab57cf07 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -195,7 +195,6 @@ void machine_halt(void) local_irq_disable(); smp_send_stop(); - local_irq_disable(); while (1); } @@ -237,7 +236,6 @@ 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.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/