diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-01 10:27:33 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-10 17:30:10 -0500 |
commit | b44c350d4104265cf3a6b4355dc1ee05c16aa5de (patch) | |
tree | e389eebe83caa3a2a2532724dc5ade66298845bd /arch/arm/kernel/setup.c | |
parent | a528721da08a793e0cec6ef6281d404eddd6e27b (diff) |
ARM: restart: allow platforms more flexibility specifying restart mode
Change 'soft_reboot' into a more generic 'restart_mode' variable,
allowing the default restart mode to be specified.
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 4755e2827dc3..a753880e984b 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -902,8 +902,8 @@ void __init setup_arch(char **cmdline_p) | |||
902 | machine_desc = mdesc; | 902 | machine_desc = mdesc; |
903 | machine_name = mdesc->name; | 903 | machine_name = mdesc->name; |
904 | 904 | ||
905 | if (mdesc->soft_reboot) | 905 | if (mdesc->restart_mode) |
906 | reboot_setup("s"); | 906 | reboot_setup(&mdesc->restart_mode); |
907 | 907 | ||
908 | init_mm.start_code = (unsigned long) _text; | 908 | init_mm.start_code = (unsigned long) _text; |
909 | init_mm.end_code = (unsigned long) _etext; | 909 | init_mm.end_code = (unsigned long) _etext; |