summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop32x
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-10-31 14:34:31 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-17 17:09:30 +0000
commit6a6f1efaced2ca7f8cd581a220af428c6bfc909d (patch)
treee1059901f3972c5870831cb301a131c953bd7464 /arch/arm/mach-iop32x
parent1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff)
downloadlinux-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-iop32x')
-rw-r--r--arch/arm/mach-iop32x/include/mach/system.h2
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 a4b808fe0d8..5987196b89c 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)
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);