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/powerpc/kexec | |
parent | 715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff) | |
parent | 26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff) | |
download | linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.gz linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.bz2 linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.zip |
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'arch/powerpc/kexec')
-rw-r--r-- | arch/powerpc/kexec/crash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c index 10f997e6bb95..22ceeeb705ab 100644 --- a/arch/powerpc/kexec/crash.c +++ b/arch/powerpc/kexec/crash.c @@ -313,7 +313,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) int (*old_handler)(struct pt_regs *regs); /* Avoid hardlocking with irresponsive CPU holding logbuf_lock */ - printk_nmi_enter(); + printk_deferred_enter(); /* * This function is only called after the system |