summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-07 02:14:00 +0100
committerAndi Kleen <andi@basil.nowhere.org>2006-12-07 02:14:00 +0100
commita63954b5cad5765e52870bb649992bf636f32a6b (patch)
treed7e8cdbda00366ca4146b784e5ae017c57f3168c /arch
parentd606f88fa5e529e9dc72be97e79db1e36a6261cb (diff)
downloadblackbird-op-linux-a63954b5cad5765e52870bb649992bf636f32a6b.tar.gz
blackbird-op-linux-a63954b5cad5765e52870bb649992bf636f32a6b.zip
[PATCH] i386: remove pointless printk from i386 oops output
This just got removed on x86-64, do the same on 32bit. It always annoyed me when this ate a line of oops output pushing interesting stuff off the screen. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/traps.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 396041a46e3d..48ebfab661b7 100644
--- a/arch/i386/kernel/traps.c
+++ b/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);
OpenPOWER on IntegriCloud