diff options
| author | Maxime Bizon <mbizon@freebox.fr> | 2006-08-05 15:14:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 11:57:47 -0400 |
| commit | 8b23d04dd26e6d170adc644cf12a0d9dfa1f5094 (patch) | |
| tree | 01657165733560aa789c09913d90d1954045e6fa /Documentation/sysctl/kernel.txt | |
| parent | 2f34931fdc78b4895553aaa33748939cc7697c99 (diff) | |
[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/kernel.txt')
| -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 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. | |||
| 211 | 211 | ||
| 212 | 0: try to continue operation | 212 | 0: try to continue operation |
| 213 | 213 | ||
| 214 | 1: delay a few seconds (to give klogd time to record the oops output) and | 214 | 1: panic immediatly. If the `panic' sysctl is also non-zero then the |
| 215 | then panic. If the `panic' sysctl is also non-zero then the machine will | 215 | machine will be rebooted. |
| 216 | be rebooted. | ||
| 217 | 216 | ||
| 218 | ============================================================== | 217 | ============================================================== |
| 219 | 218 | ||