From b7f5badd06bf35a15ad33c5fd170a5a974cea12f Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 21 Jun 2005 17:16:28 -0700
Subject: [PATCH] --- yaml --- r: 2533 b: refs/heads/master c:
 77eb65cbc18d86a9c334964ed4c3d178f5560918 h: refs/heads/master i:   2531:
 d03a5502d254ef43eb0bac4e2131db762525b647 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/traps.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d27fc89c4ba..d841d74f3ad8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14651c798a2a4d15ccc53d064df28bfd0283bad6
+refs/heads/master: 77eb65cbc18d86a9c334964ed4c3d178f5560918
diff --git a/trunk/arch/s390/kernel/traps.c b/trunk/arch/s390/kernel/traps.c
index 8b90e9528b91..ca34b6f34b38 100644
--- a/trunk/arch/s390/kernel/traps.c
+++ b/trunk/arch/s390/kernel/traps.c
@@ -668,7 +668,10 @@ asmlinkage void space_switch_exception(struct pt_regs * regs, long int_code)
 
 asmlinkage void kernel_stack_overflow(struct pt_regs * regs)
 {
-	die("Kernel stack overflow", regs, 0);
+	bust_spinlocks(1);
+	printk("Kernel stack overflow.\n");
+	show_regs(regs);
+	bust_spinlocks(0);
 	panic("Corrupt kernel stack, can't continue.");
 }