Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a6f1efa authored by Russell King's avatar Russell King
Browse files

ARM: restart: remove local_irq_disable() from within arch_reset() 



IRQs are already disabled by the time arch_reset() is called, so these
calls to local_irq_disable() instead arch_reset() are redundant.  Remove
them.

Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1ea6b8f4

arch/arm/mach-ep93xx/include/mach/system.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ static inline void arch_idle(void) 


static inline void arch_reset(char mode, const char *cmd)

{

	local_irq_disable();



	/*

	 * Set then clear the SWRST bit to initiate a software reset

	 */

arch/arm/mach-iop32x/include/mach/system.h

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ static inline void arch_idle(void) 


static inline void arch_reset(char mode, const char *cmd)

{

	local_irq_disable();



	if (machine_is_n2100()) {

		gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);

		gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);

arch/arm/mach-ixp2000/include/mach/system.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ static inline void arch_idle(void) 


static inline void arch_reset(char mode, const char *cmd)

{

	local_irq_disable();



	/*

	 * Reset flash banking register so that we are pointing at

	 * RedBoot bank.

arch/arm/mach-lpc32xx/include/mach/system.h

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd) 
	case 'h':

		printk(KERN_CRIT "RESET: Rebooting system\n");



		/* Disable interrupts */

		local_irq_disable();



		lpc32xx_watchdog_reset();

		break;

arch/arm/mach-shark/core.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
void arch_reset(char mode, const char *cmd)

{

        short temp;

        local_irq_disable();

        /* Reset the Machine via pc[3] of the sequoia chipset */

        outw(0x09,0x24);

        temp=inw(0x26);