diff options
| author | Russell King | 2011-11-01 15:27:33 +0100 |
|---|---|---|
| committer | Russell King | 2011-11-10 23:30:10 +0100 |
| commit | b44c350d4104265cf3a6b4355dc1ee05c16aa5de (patch) | |
| tree | e389eebe83caa3a2a2532724dc5ade66298845bd /arch/arm/kernel | |
| parent | ARM: restart: add restart hook to machine_desc record (diff) | |
| download | kernel-qcow2-linux-b44c350d4104265cf3a6b4355dc1ee05c16aa5de.tar.gz kernel-qcow2-linux-b44c350d4104265cf3a6b4355dc1ee05c16aa5de.tar.xz kernel-qcow2-linux-b44c350d4104265cf3a6b4355dc1ee05c16aa5de.zip | |
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')
| -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) machine_desc = mdesc; machine_name = mdesc->name; - if (mdesc->soft_reboot) - reboot_setup("s"); + if (mdesc->restart_mode) + reboot_setup(&mdesc->restart_mode); init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext; |