From 6a6f1efaced2ca7f8cd581a220af428c6bfc909d Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 31 Oct 2011 14:34:31 +0000 Subject: 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 Acked-by: Nicolas Pitre Acked-by: Will Deacon Signed-off-by: Russell King --- arch/arm/mach-shark/core.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-shark/core.c') 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); -- cgit v1.2.3 From b95ff9fe24e8757380bd9b53891df86f2499ebb8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 14:41:14 +0000 Subject: ARM: restart: shark: use new restart hook Hook the Shark restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King --- arch/arm/mach-shark/core.c | 3 ++- arch/arm/mach-shark/include/mach/system.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-shark/core.c') diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index f4b25d875f3d..a851c254ad6c 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c @@ -26,7 +26,7 @@ #define ROMCARD_SIZE 0x08000000 #define ROMCARD_START 0x10000000 -void arch_reset(char mode, const char *cmd) +static void shark_restart(char mode, const char *cmd) { short temp; /* Reset the Machine via pc[3] of the sequoia chipset */ @@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") .init_irq = shark_init_irq, .timer = &shark_timer, .dma_zone_size = SZ_4M, + .restart = shark_restart, MACHINE_END diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h index 21c373b30bbc..2cc363a3cd90 100644 --- a/arch/arm/mach-shark/include/mach/system.h +++ b/arch/arm/mach-shark/include/mach/system.h @@ -6,8 +6,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -/* Found in arch/mach-shark/core.c */ -extern void arch_reset(char mode, const char *cmd); +static inline void arch_reset(char mode, const char *cmd) +{ +} static inline void arch_idle(void) { -- cgit v1.2.3