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-u300 | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
| download | linux-3.10-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.tar.gz linux-3.10-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.tar.bz2 linux-3.10-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.zip | |
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-u300')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/include/mach/system.h b/arch/arm/mach-u300/include/mach/system.h index 8daf13634ce..6b6fef7a438 100644 --- a/arch/arm/mach-u300/include/mach/system.h +++ b/arch/arm/mach-u300/include/mach/system.h @@ -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 |