diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-31 15:34:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-17 18:09:30 +0100 |
| commit | 6a6f1efaced2ca7f8cd581a220af428c6bfc909d (patch) | |
| tree | e1059901f3972c5870831cb301a131c953bd7464 /arch/arm/mach-shark | |
| parent | Linux 3.2-rc1 (diff) | |
| download | linux-6a6f1efaced2ca7f8cd581a220af428c6bfc909d.tar.xz linux-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-shark')
| -rw-r--r-- | arch/arm/mach-shark/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index feda3ca7fc95..f4b25d875f3d 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c @@ -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); |