summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/kernel
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-07-20 10:56:55 +0200
committerNélio Laranjeiro2012-09-06 14:00:07 +0200
commitb3b24631b4b5bf0bee23c5ffe752242a1ae0924a (patch)
treea5aa25b8261355fd72471c35c188fa22e3968623 /cleopatre/linux-2.6.25.10-spc300/kernel
parentb044d33f4c9d4d41a4923a4baaf00c65a1d9318d (diff)
cleo/linux: Backport: move x86 specific oops=panic to generic code, refs #3094
From linux kernel message commit: commit d404ab0a1133e95557bb7deab2a49b348dfeba85 Author: Olaf Hering <olaf@aepfle.de> Date: Tue Mar 22 16:34:04 2011 -0700 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 'cleopatre/linux-2.6.25.10-spc300/kernel')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/kernel/panic.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c b/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
index 24af9f8bac..2ee48fcd92 100644
--- a/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
+++ b/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
@@ -299,6 +299,16 @@ void oops_exit(void)
print_oops_end_marker();
}
+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);
+
#ifdef WANT_WARN_ON_SLOWPATH
void warn_on_slowpath(const char *file, int line)
{