summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2021-08-30 17:36:10 +0300
committerPetr Mladek <pmladek@suse.com>2021-08-30 17:36:10 +0300
commitc985aafb60e972c0a6b8d0bd65e03af5890b748a (patch)
treefb75c6e5330663eeaff707dee672762e607e2f0b /arch/arm
parent715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff)
parent26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff)
downloadlinux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.xz
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/smp.c4
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: