[PATCH] ARM: remove redundant irq disable at halt and restart

[Felipe Balbi]

On Fri, Oct 24, 2014 at 09:06:32PM +0200, Johan Hovold wrote:
> 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.

Assuming this is correct, you should have:

Fixes: 44424c3 (ARM: 7803/1: Fix deadlock scenario with smp_send_stop())
Cc: <stable at vger.kernel.org> # v3.12+

> Signed-off-by: Johan Hovold <johan at 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();

... but wouldn't this reintroduce the the buck which that commit fixed ?

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141024/2526e9cd/attachment.sig>