diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-08-30 16:36:10 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-08-30 16:36:10 +0200 |
| commit | c985aafb60e972c0a6b8d0bd65e03af5890b748a (patch) | |
| tree | fb75c6e5330663eeaff707dee672762e607e2f0b /arch/arm/kernel | |
| parent | 715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff) | |
| parent | 26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff) | |
| download | linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.bz2 | |
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index c7bb168b0d97..842427ff2b3c 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -667,9 +667,9 @@ static void do_handle_IPI(int ipinr) break; case IPI_CPU_BACKTRACE: - printk_nmi_enter(); + printk_deferred_enter(); nmi_cpu_backtrace(get_irq_regs()); - printk_nmi_exit(); + printk_deferred_exit(); break; default: |