---

yaml --- r: 42997 b: refs/heads/master c: a63954b h: refs/heads/master i: 42995: f5d1dad v: v3
git-mirror · Dec 7, 2006 · 3c9d66d · 3c9d66d
1 parent d5803a6
commit 3c9d66d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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);