diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 13:23:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 13:23:34 -0700 |
| commit | 64f004a2ab68691b5a2e3db4cb460fcd31b6abc6 (patch) | |
| tree | 1ecd5f72d0d5de9781d52f353f80898ac4fb8156 /arch/x86/kernel/dumpstack.c | |
| parent | b48488d10954e0a337c41ea2e6086f274f118acf (diff) | |
| parent | 6d4d1984df1ca6347414b9d8fa4783f548ee4cc8 (diff) | |
| download | linux-stable-64f004a2ab68691b5a2e3db4cb460fcd31b6abc6.tar.gz linux-stable-64f004a2ab68691b5a2e3db4cb460fcd31b6abc6.tar.bz2 linux-stable-64f004a2ab68691b5a2e3db4cb460fcd31b6abc6.zip | |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 debug changes from Ingo Molnar:
"Stack printing fixlets"
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kernel: Use kstack_end() in dumpstack_64.c
x86/kernel: Fix output of show_stack_log_lvl()
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index ab3b65639a3e..9c30acfadae2 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -25,10 +25,12 @@ unsigned int code_bytes = 64; int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; static int die_counter; -static void printk_stack_address(unsigned long address, int reliable) +static void printk_stack_address(unsigned long address, int reliable, + void *data) { - pr_cont(" [<%p>] %s%pB\n", - (void *)address, reliable ? "" : "? ", (void *)address); + printk("%s [<%p>] %s%pB\n", + (char *)data, (void *)address, reliable ? "" : "? ", + (void *)address); } void printk_address(unsigned long address) @@ -155,8 +157,7 @@ static int print_trace_stack(void *data, char *name) static void print_trace_address(void *data, unsigned long addr, int reliable) { touch_nmi_watchdog(); - printk(data); - printk_stack_address(addr, reliable); + printk_stack_address(addr, reliable, data); } static const struct stacktrace_ops print_trace_ops = { |