summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 10:54:12 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 10:54:12 +1100
commitd8b1436d458c0797bbb33ede7a938224313e9501 (patch)
treeb736654899a73692bd6a6a48b5121d48f6aa7f39 /lib
parent3f4f5b41d642af5e50ed36e80436d0a2cd51e272 (diff)
parentd9c23523ed98a3acaa0bfd8fef143595d6aa631d (diff)
Merge remote-tracking branch 'printk/for-next'
Diffstat (limited to 'lib')
-rw-r--r--lib/nmi_backtrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c
index 75554754eadf..5f7999eacad5 100644
--- a/lib/nmi_backtrace.c
+++ b/lib/nmi_backtrace.c
@@ -77,7 +77,7 @@ void nmi_trigger_cpumask_backtrace(const cpumask_t *mask,
* Force flush any remote buffers that might be stuck in IRQ context
* and therefore could not run their irq_work.
*/
- printk_nmi_flush();
+ printk_safe_flush();
clear_bit_unlock(0, &backtrace_flag);
put_cpu();