Re: Split multi-line printk in oops output.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Sep 11, 2006 at 07:44:15AM +0200, Andi Kleen wrote:
 > 
 > >  	print_modules();
 > > -	printk(KERN_EMERG "CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\n"
 > > -			"EFLAGS: %08lx   (%s %.*s) \n",
 > > -		smp_processor_id(), 0xffff & regs->xcs, regs->eip,
 > > -		print_tainted(), regs->eflags, system_utsname.release,
 > > +	printk(KERN_EMERG "CPU:    %d\n", smp_processor_id());
 > > +	printk(KERN_EMERG "EIP:    %04x:[<%08lx>]    %s VLI\n",
 > > +		0xffff & regs->xcs, regs->eip, print_tainted());
 > > +	printk(KERN_EMERG "EFLAGS: %08lx   (%s %.*s)\n",
 > 
 > Still only using a single printk would be slightly safer

Signed-off-by: Dave Jones <[email protected]>

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 7e9edaf..b30fc9e 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -291,8 +291,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, " "),


-- 
http://www.codemonkey.org.uk
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux