aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2011-03-22 19:34:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 20:44:11 -0400
commitd404ab0a1133e95557bb7deab2a49b348dfeba85 (patch)
tree067815cd747a6998f76ff7bda2e9075f433459af /Documentation
parentb259514282d54323aaadead3dac4823ea01f9b89 (diff)
move x86 specific oops=panic to generic code
The oops=panic cmdline option is not x86 specific, move it to generic code. Update documentation. Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt5
-rw-r--r--Documentation/x86/x86_64/boot-options.txt5
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d18a9e12152a..a3b688287a8d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1825,6 +1825,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1825 perfmon on Intel CPUs instead of the 1825 perfmon on Intel CPUs instead of the
1826 CPU specific event set. 1826 CPU specific event set.
1827 1827
1828 oops=panic Always panic on oopses. Default is to just kill the process,
1829 but there is a small probability of deadlocking the machine.
1830 This will also cause panics on machine check exceptions.
1831 Useful together with panic=30 to trigger a reboot.
1832
1828 OSS [HW,OSS] 1833 OSS [HW,OSS]
1829 See Documentation/sound/oss/oss-parameters.txt 1834 See Documentation/sound/oss/oss-parameters.txt
1830 1835
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 48c13b8ab90c..092e596a1301 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -293,11 +293,6 @@ IOMMU (input/output memory management unit)
293 293
294Debugging 294Debugging
295 295
296 oops=panic Always panic on oopses. Default is to just kill the process,
297 but there is a small probability of deadlocking the machine.
298 This will also cause panics on machine check exceptions.
299 Useful together with panic=30 to trigger a reboot.
300
301 kstack=N Print N words from the kernel stack in oops dumps. 296 kstack=N Print N words from the kernel stack in oops dumps.
302 297
303 pagefaulttrace Dump all page faults. Only useful for extreme debugging 298 pagefaulttrace Dump all page faults. Only useful for extreme debugging