aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-09 21:14:47 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-09 21:14:47 -0400
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /Documentation/kernel-parameters.txt
parent010988e888a0abbe7118635c1b33d049caae6b29 (diff)
parent87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff)
Manual merge with Linus
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 111e98056195..db2603ceabba 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1175,6 +1175,11 @@ running once the system is up.
1175 New name for the ramdisk parameter. 1175 New name for the ramdisk parameter.
1176 See Documentation/ramdisk.txt. 1176 See Documentation/ramdisk.txt.
1177 1177
1178 rdinit= [KNL]
1179 Format: <full_path>
1180 Run specified binary instead of /init from the ramdisk,
1181 used for early userspace startup. See initrd.
1182
1178 reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode 1183 reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
1179 Format: <reboot_mode>[,<reboot_mode2>[,...]] 1184 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1180 See arch/*/kernel/reboot.c. 1185 See arch/*/kernel/reboot.c.