---

yaml --- r: 33239 b: refs/heads/master c: 8b23d04 h: refs/heads/master i: 33237: aa4daab 33235: 9fce9f7 33231: 697604d v: v3
git-mirror · Aug 6, 2006 · fda0c69 · fda0c69
1 parent a97b1fc
commit fda0c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f34931fdc78b4895553aaa33748939cc7697c99
+refs/heads/master: 8b23d04dd26e6d170adc644cf12a0d9dfa1f5094
diff --git a/trunk/Documentation/sysctl/kernel.txt b/trunk/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.
 
 ==============================================================