[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110127221511.GA32313@aepfle.de>
Date: Thu, 27 Jan 2011 23:15:11 +0100
From: Olaf Hering <olaf@...fle.de>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...fle.de>
---
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(-)
--- linux-2.6.38.rc.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.38.rc/Documentation/kernel-parameters.txt
@@ -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
--- linux-2.6.38.rc.orig/Documentation/x86/x86_64/boot-options.txt
+++ linux-2.6.38.rc/Documentation/x86/x86_64/boot-options.txt
@@ -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
--- linux-2.6.38.rc.orig/arch/x86/kernel/dumpstack.c
+++ linux-2.6.38.rc/arch/x86/kernel/dumpstack.c
@@ -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)
--- linux-2.6.38.rc.orig/kernel/panic.c
+++ linux-2.6.38.rc/kernel/panic.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists