Skip to contentSkip to conversation

move x86 specific oops=panic to generic code

PATCH In review Olaf Hering 2 participants 2 messages Jan 27, 2011 – Jan 28, 2011

Subsystems (3)
Documentation x86 x86 stack unwinding
lore
Share & tools
lore

Olaf Hering

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 Documentation/kernel-parameters.txt       |    5 +++++
 Documentation/x86/x86_64/boot-options.txt |    5 -----
 arch/x86/kernel/dumpstack.c               |   10 ----------
 kernel/panic.c                            |   10 ++++++++++
 4 files changed, 15 insertions(+), 15 deletions(-)
Documentation/kernel-parameters.txt +5 -0
@@ -1805,6 +1805,11 @@ and is between 256 and 4096 characters.
 				perfmon on Intel CPUs instead of the
 				CPU specific event set.
 
+	oops=panic	Always panic on oopses. Default is to just kill the process,
+			but there is a small probability of deadlocking the machine.
+			This will also cause panics on machine check exceptions.
+			Useful together with panic=30 to trigger a reboot.
+
 	OSS		[HW,OSS]
 			See Documentation/sound/oss/oss-parameters.txt
Documentation/x86/x86_64/boot-options.txt +0 -5
@@ -293,11 +293,6 @@ IOMMU (input/output memory management un
 
 Debugging
 
-  oops=panic	Always panic on oopses. Default is to just kill the process,
-		but there is a small probability of deadlocking the machine.
-		This will also cause panics on machine check exceptions.
-		Useful together with panic=30 to trigger a reboot.
-
   kstack=N	Print N words from the kernel stack in oops dumps.
 
   pagefaulttrace  Dump all page faults. Only useful for extreme debugging
arch/x86/kernel/dumpstack.c +0 -10
@@ -345,16 +345,6 @@ die_nmi(char *str, struct pt_regs *regs,
 	do_exit(SIGBUS);
 }
 
-static int __init oops_setup(char *s)
-{
-	if (!s)
-		return -EINVAL;
-	if (!strcmp(s, "panic"))
-		panic_on_oops = 1;
-	return 0;
-}
-early_param("oops", oops_setup);
-
 static int __init kstack_setup(char *s)
 {
 	if (!s)
kernel/panic.c +10 -0
@@ -433,3 +433,13 @@ EXPORT_SYMBOL(__stack_chk_fail);
 
 core_param(panic, panic_timeout, int, 0644);
 core_param(pause_on_oops, pause_on_oops, int, 0644);
+
+static int __init oops_setup(char *s)
+{
+	if (!s)
+		return -EINVAL;
+	if (!strcmp(s, "panic"))
+		panic_on_oops = 1;
+	return 0;
+}
+early_param("oops", oops_setup);