From 565a25a5639b6637a8ff24e67e303449c7679a2e Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 26 Sep 2006 10:52:41 +0200 Subject: [PATCH] --- yaml --- r: 35965 b: refs/heads/master c: f354b3a92af9b132b188b9c8ebbfb74de699926d h: refs/heads/master i: 35963: f964af722bc111ed0a5d091dbf74b7144f645863 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/traps.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b3043f3ad4fc..4cb7c2e8e969 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2817716ace8c397685bd702223cc5a8a42c7e997 +refs/heads/master: f354b3a92af9b132b188b9c8ebbfb74de699926d diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c index 5c0f4960c67d..c7adb076e811 100644 --- a/trunk/arch/i386/kernel/traps.c +++ b/trunk/arch/i386/kernel/traps.c @@ -351,8 +351,9 @@ void show_registers(struct pt_regs *regs) ss = regs->xss & 0xffff; } print_modules(); - printk(KERN_EMERG "CPU: %d\nEIP: %04x:[<%08lx>] %s VLI\n" - "EFLAGS: %08lx (%s %.*s) \n", + printk(KERN_EMERG "CPU: %d\n" + KERN_EMERG "EIP: %04x:[<%08lx>] %s VLI\n" + KERN_EMERG "EFLAGS: %08lx (%s %.*s)\n", smp_processor_id(), 0xffff & regs->xcs, regs->eip, print_tainted(), regs->eflags, system_utsname.release, (int)strcspn(system_utsname.version, " "),