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-pxa/tosa.c | |
| parent | 14b6848bc0134b8838d374c423df3edda9b1490e (diff) | |
| download | op-kernel-dev-be093beb608edf821b45fe00a8a080fb5c6ed4af.zip op-kernel-dev-be093beb608edf821b45fe00a8a080fb5c6ed4af.tar.gz | |
[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-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 66b1380..4f6f502 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -876,10 +876,10 @@ static struct platform_device *devices[] __initdata = { static void tosa_poweroff(void) { - arm_machine_restart('g'); + arm_machine_restart('g', NULL); } -static void tosa_restart(char mode) +static void tosa_restart(char mode, const char *cmd) { /* Bootloader magic for a reboot */ if((MSC0 & 0xffff0000) == 0x7ff00000) |
