diff options
| author | Petr Mladek <pmladek@suse.com> | 2022-05-23 10:55:39 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2022-05-23 10:55:39 +0200 |
| commit | 1c6fd59943a630f087b4b3089aefdcb0bf43cca0 (patch) | |
| tree | 4806aa6762bde2835b2be5f2ee4c8be40536e910 /lib | |
| parent | a5c7a39f508ae1fd3288493b96dd26079bae41bf (diff) | |
| parent | 701850dc0c31bfadf75a0a74af7d2c97859945ec (diff) | |
Merge branch 'rework/kthreads' into for-linus
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dump_stack.c | 4 | ||||
| -rw-r--r-- | lib/nmi_backtrace.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/dump_stack.c b/lib/dump_stack.c index 6b7f1bf6715d..83471e81501a 100644 --- a/lib/dump_stack.c +++ b/lib/dump_stack.c @@ -102,9 +102,9 @@ asmlinkage __visible void dump_stack_lvl(const char *log_lvl) * Permit this cpu to perform nested stack dumps while serialising * against other CPUs */ - printk_cpu_lock_irqsave(flags); + printk_cpu_sync_get_irqsave(flags); __dump_stack(log_lvl); - printk_cpu_unlock_irqrestore(flags); + printk_cpu_sync_put_irqrestore(flags); } EXPORT_SYMBOL(dump_stack_lvl); diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c index 199ab201d501..d01aec6ae15c 100644 --- a/lib/nmi_backtrace.c +++ b/lib/nmi_backtrace.c @@ -99,7 +99,7 @@ bool nmi_cpu_backtrace(struct pt_regs *regs) * Allow nested NMI backtraces while serializing * against other CPUs. */ - printk_cpu_lock_irqsave(flags); + printk_cpu_sync_get_irqsave(flags); if (!READ_ONCE(backtrace_idle) && regs && cpu_in_idle(instruction_pointer(regs))) { pr_warn("NMI backtrace for cpu %d skipped: idling at %pS\n", cpu, (void *)instruction_pointer(regs)); @@ -110,7 +110,7 @@ bool nmi_cpu_backtrace(struct pt_regs *regs) else dump_stack(); } - printk_cpu_unlock_irqrestore(flags); + printk_cpu_sync_put_irqrestore(flags); cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask)); return true; } |