Commit-ID: d438f5fda30ec087512355e405e9c8955d8bd337 Gitweb: http://git.kernel.org/tip/d438f5fda30ec087512355e405e9c8955d8bd337 Author: Josh Poimboeuf <jpoim...@redhat.com> AuthorDate: Wed, 24 Aug 2016 11:50:16 -0500 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 8 Sep 2016 08:58:40 +0200
x86/dumpstack: Make printk_stack_address() more generally useful Change printk_stack_address() to be useful when called by an unwinder outside the context of dump_trace(). Specifically: - printk_stack_address()'s 'data' argument is always used as the log level string. Make that explicit. - Call touch_nmi_watchdog(). Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Brian Gerst <brge...@gmail.com> Cc: Byungchul Park <byungchul.p...@lge.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Kees Cook <keesc...@chromium.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Nilay Vaish <nilayva...@gmail.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Steven Rostedt <rost...@goodmis.org> Cc: Thomas Gleixner <t...@linutronix.de> Link: http://lkml.kernel.org/r/9fbe0db05bacf66d337c162edbf61450d0cff1e2.1472057064.git.jpoim...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/dumpstack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 01072e9..f0ddf85 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -26,10 +26,11 @@ int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; static int die_counter; static void printk_stack_address(unsigned long address, int reliable, - void *data) + char *log_lvl) { + touch_nmi_watchdog(); printk("%s [<%p>] %s%pB\n", - (char *)data, (void *)address, reliable ? "" : "? ", + log_lvl, (void *)address, reliable ? "" : "? ", (void *)address); } @@ -148,7 +149,6 @@ static int print_trace_stack(void *data, char *name) */ static int print_trace_address(void *data, unsigned long addr, int reliable) { - touch_nmi_watchdog(); printk_stack_address(addr, reliable, data); return 0; }
