From: Maxime Bizon <mbizon@freebox.fr>
Date: Sat, 5 Aug 2006 19:14:32 +0000 (-0700)
Subject: [PATCH] doc: update panic_on_oops documentation
X-Git-Tag: v2.6.18-rc4~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8b23d04dd26e6d170adc644cf12a0d9dfa1f5094;p=linux-2.6-omap-h63xx.git

[PATCH] doc: update panic_on_oops documentation

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index b0c7ab93dcb..7345c338080 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered.
 
 0: try to continue operation
 
-1: delay a few seconds (to give klogd time to record the oops output) and
-   then panic.  If the `panic' sysctl is also non-zero then the machine will
-   be rebooted.
+1: panic immediatly.  If the `panic' sysctl is also non-zero then the
+   machine will be rebooted.
 
 ==============================================================