diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 16:20:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 16:20:24 +0000 |
| commit | be093beb608edf821b45fe00a8a080fb5c6ed4af (patch) | |
| tree | 05751248a909761dab9ccb29fd08bf2c5683ef0d /arch/arm/mach-realview | |
| parent | 14b6848bc0134b8838d374c423df3edda9b1490e (diff) | |
| download | kernel_samsung_crespo-be093beb608edf821b45fe00a8a080fb5c6ed4af.zip kernel_samsung_crespo-be093beb608edf821b45fe00a8a080fb5c6ed4af.tar.gz kernel_samsung_crespo-be093beb608edf821b45fe00a8a080fb5c6ed4af.tar.bz2 | |
[ARM] pass reboot command line to arch_reset()
OMAP wishes to pass state to the boot loader upon reboot in order to
instruct it whether to wait for USB-based reflashing or not. There is
already a facility to do this via the reboot() syscall, except we ignore
the string passed to machine_restart().
This patch fixes things to pass this string to arch_reset(). This means
that we keep the reboot mode limited to telling the kernel _how_ to
perform the reboot which should be independent of what we request the
boot loader to do.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/include/mach/system.h b/arch/arm/mach-realview/include/mach/system.h index a2f61c7..1a15a44 100644 --- a/arch/arm/mach-realview/include/mach/system.h +++ b/arch/arm/mach-realview/include/mach/system.h @@ -34,7 +34,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) { void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET; unsigned int val; |