diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 12:20:24 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 12:20:24 -0400 |
commit | be093beb608edf821b45fe00a8a080fb5c6ed4af (patch) | |
tree | 05751248a909761dab9ccb29fd08bf2c5683ef0d /arch/arm/mach-pxa/poodle.c | |
parent | 14b6848bc0134b8838d374c423df3edda9b1490e (diff) |
[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/poodle.c')
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 572ddec2b3e6..036bbde4d221 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -501,12 +501,12 @@ static struct platform_device *devices[] __initdata = { | |||
501 | 501 | ||
502 | static void poodle_poweroff(void) | 502 | static void poodle_poweroff(void) |
503 | { | 503 | { |
504 | arm_machine_restart('h'); | 504 | arm_machine_restart('h', NULL); |
505 | } | 505 | } |
506 | 506 | ||
507 | static void poodle_restart(char mode) | 507 | static void poodle_restart(char mode, const char *cmd) |
508 | { | 508 | { |
509 | arm_machine_restart('h'); | 509 | arm_machine_restart('h', cmd); |
510 | } | 510 | } |
511 | 511 | ||
512 | static void __init poodle_init(void) | 512 | static void __init poodle_init(void) |