diff options
| author | Robin Holt <holt@sgi.com> | 2013-07-09 01:01:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 19:33:29 +0200 |
| commit | 1b3a5d02ee070c8f9943333b9b6370f486601e0f (patch) | |
| tree | 0630bd988dc285ca3af7d3520826b5f0d9e42748 /arch/unicore32 | |
| parent | reboot: arm: change reboot_mode to use enum reboot_mode (diff) | |
| download | linux-1b3a5d02ee070c8f9943333b9b6370f486601e0f.tar.xz linux-1b3a5d02ee070c8f9943333b9b6370f486601e0f.zip | |
reboot: move arch/x86 reboot= handling to generic kernel
Merge together the unicore32, arm, and x86 reboot= command line
parameter handling.
Signed-off-by: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/kernel/process.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c index 93dd035a8c33..778ebba80827 100644 --- a/arch/unicore32/kernel/process.c +++ b/arch/unicore32/kernel/process.c @@ -51,16 +51,6 @@ void arch_cpu_idle(void) local_irq_enable(); } -static enum reboot_mode reboot_mode = REBOOT_HARD; - -int __init reboot_setup(char *str) -{ - if ('s' == str[0]) - reboot_mode = REBOOT_SOFT; - return 1; -} -__setup("reboot=", reboot_setup); - void machine_halt(void) { gpio_set_value(GPO_SOFT_OFF, 0); |