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

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
...@@ -11,8 +11,6 @@ static inline void arch_idle(void) ...@@ -11,8 +11,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
/* /*
* Set then clear the SWRST bit to initiate a software reset * Set then clear the SWRST bit to initiate a software reset
*/ */
......
...@@ -18,8 +18,6 @@ static inline void arch_idle(void) ...@@ -18,8 +18,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
if (machine_is_n2100()) { if (machine_is_n2100()) {
gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
......
...@@ -19,8 +19,6 @@ static inline void arch_idle(void) ...@@ -19,8 +19,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
/* /*
* Reset flash banking register so that we are pointing at * Reset flash banking register so that we are pointing at
* RedBoot bank. * RedBoot bank.
......
...@@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd) ...@@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd)
case 'h': case 'h':
printk(KERN_CRIT "RESET: Rebooting system\n"); printk(KERN_CRIT "RESET: Rebooting system\n");
/* Disable interrupts */
local_irq_disable();
lpc32xx_watchdog_reset(); lpc32xx_watchdog_reset();
break; break;
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
void arch_reset(char mode, const char *cmd) void arch_reset(char mode, const char *cmd)
{ {
short temp; short temp;
local_irq_disable();
/* Reset the Machine via pc[3] of the sequoia chipset */ /* Reset the Machine via pc[3] of the sequoia chipset */
outw(0x09,0x24); outw(0x09,0x24);
temp=inw(0x26); temp=inw(0x26);
......
...@@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd) ...@@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
case 's': case 's':
case 'h': case 'h':
printk(KERN_CRIT "RESET: shutting down/rebooting system\n"); printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
/* Disable interrupts */
local_irq_disable();
#ifdef CONFIG_COH901327_WATCHDOG #ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset(); coh901327_watchdog_reset();
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment