openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Russell King 2011-10-31 14:34:31 +00:00
parent 1ea6b8f489
commit 6a6f1eface
6 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ep93xx/include/mach/system.h
View File

@ -11,8 +11,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
/* /*
* Set then clear the SWRST bit to initiate a software reset * Set then clear the SWRST bit to initiate a software reset
*/ */

2
arch/arm/mach-iop32x/include/mach/system.h
View File

@ -18,8 +18,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
if (machine_is_n2100()) { if (machine_is_n2100()) {
gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);

2
arch/arm/mach-ixp2000/include/mach/system.h
View File

@ -19,8 +19,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
local_irq_disable();
/* /*
* Reset flash banking register so that we are pointing at * Reset flash banking register so that we are pointing at
* RedBoot bank. * RedBoot bank.

3
arch/arm/mach-lpc32xx/include/mach/system.h
View File

@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd)
case 'h': case 'h':
printk(KERN_CRIT "RESET: Rebooting system\n"); printk(KERN_CRIT "RESET: Rebooting system\n");
/* Disable interrupts */
local_irq_disable();
lpc32xx_watchdog_reset(); lpc32xx_watchdog_reset();
break; break;

1
arch/arm/mach-shark/core.c
View File

@ -29,7 +29,6 @@
void arch_reset(char mode, const char *cmd) void arch_reset(char mode, const char *cmd)
{ {
short temp; short temp;
local_irq_disable();
/* Reset the Machine via pc[3] of the sequoia chipset */ /* Reset the Machine via pc[3] of the sequoia chipset */
outw(0x09,0x24); outw(0x09,0x24);
temp=inw(0x26); temp=inw(0x26);

2
arch/arm/mach-u300/include/mach/system.h
View File

@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
case 's': case 's':
case 'h': case 'h':
printk(KERN_CRIT "RESET: shutting down/rebooting system\n"); printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
/* Disable interrupts */
local_irq_disable();
#ifdef CONFIG_COH901327_WATCHDOG #ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset(); coh901327_watchdog_reset();
#endif #endif