From c7dcefdc696722976314dbc21d3dbf81a0231435 Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Sat, 4 Oct 2008 23:12:45 +0200
Subject: [PATCH] --- yaml --- r: 113574 b: refs/heads/master c:
 802a67de0cbd1ef10df80ad48b840e2103b13e52 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/kernel/dumpstack_32.c | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1be72fda15a4..4808d5fcff9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0a816403c53411bb6b6fb8bf60cef30695b09d
+refs/heads/master: 802a67de0cbd1ef10df80ad48b840e2103b13e52
diff --git a/trunk/arch/x86/kernel/dumpstack_32.c b/trunk/arch/x86/kernel/dumpstack_32.c
index 09bc3330d557..9a8920abe4ba 100644
--- a/trunk/arch/x86/kernel/dumpstack_32.c
+++ b/trunk/arch/x86/kernel/dumpstack_32.c
@@ -418,13 +418,24 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)
 	do_exit(SIGSEGV);
 }
 
+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)
+		return -EINVAL;
 	kstack_depth_to_print = simple_strtoul(s, NULL, 0);
-
-	return 1;
+	return 0;
 }
-__setup("kstack=", kstack_setup);
+early_param("kstack", kstack_setup);
 
 static int __init code_bytes_setup(char *s)
 {