summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2007-02-12 00:52:18 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:48:29 -0800
commit473e66fd24a230e03f6f164913bedb81c0ba052a (patch)
tree00495c09f8fa8a8bfb3c4cf8937751ea70e1c2ff
parentbe6b026785414033aac36887cb9ea0ee1244254c (diff)
downloadlinux-473e66fd24a230e03f6f164913bedb81c0ba052a.tar.bz2
[PATCH] kexec: fix references to init in documentation for kexec
I've noticed that the boot options are not correct for in the documentation for kdump. The "init" keyword is not necessary, and causes a kernel panic when booting with an initrd on Fedora 5. [horms@verge.net.au: put original comment with the latest version of the patch] Signed-off-by: Judith Lebzeelter <judith@osdl.org> Acked-by: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Simon Horman <horms@verge.net.au> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/kdump/kdump.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 073306818347..79775a4130b5 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -311,10 +311,10 @@ Following are the arch specific command line options to be used while
loading dump-capture kernel.
For i386, x86_64 and ia64:
- "init 1 irqpoll maxcpus=1"
+ "1 irqpoll maxcpus=1"
For ppc64:
- "init 1 maxcpus=1 noirqdistrib"
+ "1 maxcpus=1 noirqdistrib"
Notes on loading the dump-capture kernel:
@@ -332,8 +332,8 @@ Notes on loading the dump-capture kernel:
* You must specify <root-dev> in the format corresponding to the root
device name in the output of mount command.
-* "init 1" boots the dump-capture kernel into single-user mode without
- networking. If you want networking, use "init 3."
+* Boot parameter "1" boots the dump-capture kernel into single-user
+ mode without networking. If you want networking, use "3".
* We generally don' have to bring up a SMP kernel just to capture the
dump. Hence generally it is useful either to build a UP dump-capture