Переглянути джерело

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>
Jisheng Zhang 9 роки тому
батько
коміт
953efb2b86
1 змінених файлів з 0 додано та 3 видалено
  1. 0 3
      arch/arm/kernel/reboot.c

+ 0 - 3
arch/arm/kernel/reboot.c

@@ -104,8 +104,6 @@ void machine_halt(void)
 {
 {
 	local_irq_disable();
 	local_irq_disable();
 	smp_send_stop();
 	smp_send_stop();
-
-	local_irq_disable();
 	while (1);
 	while (1);
 }
 }
 
 
@@ -150,6 +148,5 @@ void machine_restart(char *cmd)
 
 
 	/* Whoops - the platform was unable to reboot. Tell the user! */
 	/* Whoops - the platform was unable to reboot. Tell the user! */
 	printk("Reboot failed -- System halted\n");
 	printk("Reboot failed -- System halted\n");
-	local_irq_disable();
 	while (1);
 	while (1);
 }
 }