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: 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>
This commit is contained in:
parent
1ea6b8f489
commit
6a6f1eface
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue