aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2013-07-08 19:01:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:29 -0400
commit1b3a5d02ee070c8f9943333b9b6370f486601e0f (patch)
tree0630bd988dc285ca3af7d3520826b5f0d9e42748 /Documentation/kernel-parameters.txt
parent7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (diff)
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 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt14
1 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 25dc4a0e7e48..75236f1972d9 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2681,9 +2681,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2681 Run specified binary instead of /init from the ramdisk, 2681 Run specified binary instead of /init from the ramdisk,
2682 used for early userspace startup. See initrd. 2682 used for early userspace startup. See initrd.
2683 2683
2684 reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode 2684 reboot= [KNL]
2685 Format: <reboot_mode>[,<reboot_mode2>[,...]] 2685 Format (x86 or x86_64):
2686 See arch/*/kernel/reboot.c or arch/*/kernel/process.c 2686 [w[arm] | c[old] | h[ard] | s[oft] | g[pio]] \
2687 [[,]s[mp]#### \
2688 [[,]b[ios] | a[cpi] | k[bd] | t[riple] | e[fi] | p[ci]] \
2689 [[,]f[orce]
2690 Where reboot_mode is one of warm (soft) or cold (hard) or gpio,
2691 reboot_type is one of bios, acpi, kbd, triple, efi, or pci,
2692 reboot_force is either force or not specified,
2693 reboot_cpu is s[mp]#### with #### being the processor
2694 to be used for rebooting.
2687 2695
2688 relax_domain_level= 2696 relax_domain_level=
2689 [KNL, SMP] Set scheduler's default relax_domain_level. 2697 [KNL, SMP] Set scheduler's default relax_domain_level.