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/mioa701.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/mioa701.c')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 025772785d36..97c93a7a285c 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -788,13 +788,13 @@ static void mioa701_machine_exit(void); | |||
788 | static void mioa701_poweroff(void) | 788 | static void mioa701_poweroff(void) |
789 | { | 789 | { |
790 | mioa701_machine_exit(); | 790 | mioa701_machine_exit(); |
791 | arm_machine_restart('s'); | 791 | arm_machine_restart('s', NULL); |
792 | } | 792 | } |
793 | 793 | ||
794 | static void mioa701_restart(char c) | 794 | static void mioa701_restart(char c, const char *cmd) |
795 | { | 795 | { |
796 | mioa701_machine_exit(); | 796 | mioa701_machine_exit(); |
797 | arm_machine_restart('s'); | 797 | arm_machine_restart('s', cmd); |
798 | } | 798 | } |
799 | 799 | ||
800 | struct gpio_ress global_gpios[] = { | 800 | struct gpio_ress global_gpios[] = { |