diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-31 14:34:31 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-17 17:09:30 +0000 |
| commit | 6a6f1efaced2ca7f8cd581a220af428c6bfc909d (patch) | |
| tree | e1059901f3972c5870831cb301a131c953bd7464 /arch/arm/mach-lpc32xx | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
| download | op-kernel-dev-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.zip op-kernel-dev-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
| -rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/system.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/system.h b/arch/arm/mach-lpc32xx/include/mach/system.h index df3b0de..d47f3b1 100644 --- a/arch/arm/mach-lpc32xx/include/mach/system.h +++ b/arch/arm/mach-lpc32xx/include/mach/system.h @@ -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; |
