Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f6aef92 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] arch_reset() now takes a second parameter 



Add it to the new platforms.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0d34fb8e

arch/arm/mach-gemini/include/mach/system.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline void arch_idle(void) 
	cpu_do_idle();

}



static inline void arch_reset(char mode)

static inline void arch_reset(char mode, const char *cmd)

{

	__raw_writel(RESET_GLOBAL | RESET_CPU1,

		     IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);

arch/arm/mach-mmp/include/mach/system.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static inline void arch_idle(void) 
	cpu_do_idle();

}



static inline void arch_reset(char mode)

static inline void arch_reset(char mode, const char *cmd)

{

	cpu_reset(0);

}