diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-31 10:34:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-17 12:09:30 -0500 |
commit | 6a6f1efaced2ca7f8cd581a220af428c6bfc909d (patch) | |
tree | e1059901f3972c5870831cb301a131c953bd7464 /arch/arm/mach-iop32x | |
parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) |
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-iop32x')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index a4b808fe0d81..5987196b89c4 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h | |||
@@ -18,8 +18,6 @@ static inline void arch_idle(void) | |||
18 | 18 | ||
19 | static inline void arch_reset(char mode, const char *cmd) | 19 | static inline void arch_reset(char mode, const char *cmd) |
20 | { | 20 | { |
21 | local_irq_disable(); | ||
22 | |||
23 | if (machine_is_n2100()) { | 21 | if (machine_is_n2100()) { |
24 | gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); | 22 | gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); |
25 | gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); | 23 | gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); |