diff options
| author | Maxime Bizon | 2006-08-05 21:14:32 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-08-06 17:57:47 +0200 |
| commit | 8b23d04dd26e6d170adc644cf12a0d9dfa1f5094 (patch) | |
| tree | 01657165733560aa789c09913d90d1954045e6fa /Documentation/sysctl | |
| parent | [PATCH] knfsd: fix race related problem when adding items to and svcrpc auth ... (diff) | |
| download | kernel-qcow2-linux-8b23d04dd26e6d170adc644cf12a0d9dfa1f5094.tar.gz kernel-qcow2-linux-8b23d04dd26e6d170adc644cf12a0d9dfa1f5094.tar.xz kernel-qcow2-linux-8b23d04dd26e6d170adc644cf12a0d9dfa1f5094.zip | |
[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>
Diffstat (limited to 'Documentation/sysctl')
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index b0c7ab93dcb9..7345c338080a 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. ============================================================== |