Skip to content

Commit

Permalink
ARM: restart: remove local_irq_disable() from within arch_reset()
Browse files Browse the repository at this point in the history
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Nov 17, 2011
1 parent 1ea6b8f commit 6a6f1ef
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions arch/arm/mach-ep93xx/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-iop32x/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-ixp2000/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-lpc32xx/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-shark/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-u300/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
case 's':
case 'h':
printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
/* Disable interrupts */
local_irq_disable();
#ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset();
#endif
Expand Down

0 comments on commit 6a6f1ef

Please sign in to comment.