From 3c9d66d3014ebb7b986dfda1755c042ebf3dd16f Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 7 Dec 2006 02:14:00 +0100
Subject: [PATCH] --- yaml --- r: 42997 b: refs/heads/master c:
 a63954b5cad5765e52870bb649992bf636f32a6b h: refs/heads/master i:   42995:
 f5d1dada2a59684a9a6b6f13a59852a3f6722239 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/traps.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62bc4ea114d6..5b4d8527f108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d606f88fa5e529e9dc72be97e79db1e36a6261cb
+refs/heads/master: a63954b5cad5765e52870bb649992bf636f32a6b
diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c
index 396041a46e3d..48ebfab661b7 100644
--- a/trunk/arch/i386/kernel/traps.c
+++ b/trunk/arch/i386/kernel/traps.c
@@ -777,7 +777,6 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg)
 	printk(" on CPU%d, eip %08lx, registers:\n",
 		smp_processor_id(), regs->eip);
 	show_registers(regs);
-	printk(KERN_EMERG "console shuts up ...\n");
 	console_silent();
 	spin_unlock(&nmi_print_lock);
 	bust_spinlocks(0);