From fda0c69f2a77c41cb5836ebd7a38b756ac2d0d81 Mon Sep 17 00:00:00 2001 From: Maxime Bizon Date: Sat, 5 Aug 2006 12:14:32 -0700 Subject: [PATCH] --- yaml --- r: 33239 b: refs/heads/master c: 8b23d04dd26e6d170adc644cf12a0d9dfa1f5094 h: refs/heads/master i: 33237: aa4daab4b71dbbca0745c16fd06e4af1d2626635 33235: 9fce9f77de41ff9628b7a2a395cac1270faae111 33231: 697604d26a67e2e8e7e2290ef9e98e64796a9253 v: v3 --- [refs] | 2 +- trunk/Documentation/sysctl/kernel.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b69958277bef..f8ee1eb069e0 100644 --- 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 index b0c7ab93dcb9..7345c338080a 100644 --- 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. ==============================================================