Messages in this thread Patch in this message | | | Date | Thu, 10 Mar 2011 22:25:16 GMT | From | tip-bot for Namhyung Kim <> | Subject | [tip:x86/cleanups] x86, dumpstack: Cleanup printks |
| |
Commit-ID: 2b8689e03cd48bb832b933ce5b6335f30e02c6f9 Gitweb: http://git.kernel.org/tip/2b8689e03cd48bb832b933ce5b6335f30e02c6f9 Author: Namhyung Kim <namhyung@gmail.com> AuthorDate: Tue, 8 Mar 2011 20:44:20 +0900 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Thu, 10 Mar 2011 23:20:30 +0100
x86, dumpstack: Cleanup printks
Use KERN_CONT level if messages are continued from previous one. Also remove a pair of angle brackets on EOE for consistency.
Signed-off-by: Namhyung Kim <namhyung@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <1299584662-24421-2-git-send-email-namhyung@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/dumpstack_32.c | 8 ++++---- arch/x86/kernel/dumpstack_64.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index 3b97a80..c99f9ed 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c @@ -116,16 +116,16 @@ void show_registers(struct pt_regs *regs) for (i = 0; i < code_len; i++, ip++) { if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { - printk(" Bad EIP value."); + printk(KERN_CONT " Bad EIP value."); break; } if (ip == (u8 *)regs->ip) - printk("<%02x> ", c); + printk(KERN_CONT "<%02x> ", c); else - printk("%02x ", c); + printk(KERN_CONT "%02x ", c); } } - printk("\n"); + printk(KERN_CONT "\n"); } int is_valid_bugaddr(unsigned long ip) diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index e71c98d..50aa303 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -180,7 +180,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, bp = ops->walk_stack(tinfo, stack, bp, ops, data, estack_end, &graph); - ops->stack(data, "<EOE>"); + ops->stack(data, "EOE"); /* * We link to the next stack via the * second-to-last pointer (index -2 to end) in the @@ -311,16 +311,16 @@ void show_registers(struct pt_regs *regs) for (i = 0; i < code_len; i++, ip++) { if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { - printk(" Bad RIP value."); + printk(KERN_CONT " Bad RIP value."); break; } if (ip == (u8 *)regs->ip) - printk("<%02x> ", c); + printk(KERN_CONT "<%02x> ", c); else - printk("%02x ", c); + printk(KERN_CONT "%02x ", c); } } - printk("\n"); + printk(KERN_CONT "\n"); } int is_valid_bugaddr(unsigned long ip)
| |