aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/dumpstack_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
-rw-r--r--arch/x86/kernel/dumpstack_64.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 361afa8864b4..521c833cdc3b 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -247,24 +247,29 @@ EXPORT_SYMBOL(dump_trace);
247static void 247static void
248print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) 248print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)
249{ 249{
250 printk(data);
250 print_symbol(msg, symbol); 251 print_symbol(msg, symbol);
251 printk("\n"); 252 printk("\n");
252} 253}
253 254
254static void print_trace_warning(void *data, char *msg) 255static void print_trace_warning(void *data, char *msg)
255{ 256{
256 printk("%s\n", msg); 257 printk("%s%s\n", (char *)data, msg);
257} 258}
258 259
259static int print_trace_stack(void *data, char *name) 260static int print_trace_stack(void *data, char *name)
260{ 261{
261 printk(" <%s> ", name); 262 printk("%s <%s> ", (char *)data, name);
262 return 0; 263 return 0;
263} 264}
264 265
266/*
267 * Print one address/symbol entries per line.
268 */
265static void print_trace_address(void *data, unsigned long addr, int reliable) 269static void print_trace_address(void *data, unsigned long addr, int reliable)
266{ 270{
267 touch_nmi_watchdog(); 271 touch_nmi_watchdog();
272 printk(data);
268 printk_address(addr, reliable); 273 printk_address(addr, reliable);
269} 274}
270 275