From f10775e2cb34d2b69e366cd0dc016f6f54c462d8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 20 Feb 2006 00:36:57 -0800
Subject: [PATCH] --- yaml --- r: 21503 b: refs/heads/master c:
 37133c006cd3ff4f4dccb3df88efc446863b515e h: refs/heads/master i:   21501:
 9108f3d7b3700809b68ef91564b0cbf54fa23259   21499:
 8fc0a4d8efca0adb3d2504edb6421a1bdd5b3664   21495:
 882515921b3704b5802d362b668cf9565eb96489   21487:
 9efde234397f5421d3e15ed92e18df13aa82bf28   21471:
 334ad979545058bc29f6036259322412c6181333   21439:
 e0a599251d8ea8d02424ce52b52cbae739a8fda2   21375:
 d3aa8891740bd11d0da79b039ad226f06550cd1f   21247:
 08586e62ce30ff78bf1cd5eb08ac0491acbfc258   20991:
 d2687a6199f374786d9e20952407885b26b64d5a   20479:
 1f6aadaef35dc42c25871b55751f3d4a38d32ea2 v: v3

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

diff --git a/[refs] b/[refs]
index 1d0e0f8290e3..0c797e872dd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a32fd4d0d42258004631dc0ac90665382a2e5dc
+refs/heads/master: 37133c006cd3ff4f4dccb3df88efc446863b515e
diff --git a/trunk/arch/sparc64/kernel/traps.c b/trunk/arch/sparc64/kernel/traps.c
index 6d45867ee166..4eb2ee1125d1 100644
--- a/trunk/arch/sparc64/kernel/traps.c
+++ b/trunk/arch/sparc64/kernel/traps.c
@@ -2226,10 +2226,11 @@ void die_if_kernel(char *str, struct pt_regs *regs)
 		}
 		user_instruction_dump ((unsigned int __user *) regs->tpc);
 	}
+#if 0
 #ifdef CONFIG_SMP
 	smp_report_regs();
 #endif
-                                                	
+#endif                                                	
 	if (regs->tstate & TSTATE_PRIV)
 		do_exit(SIGKILL);
 	do_exit(SIGSEGV);