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 | |
| parent | 715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff) | |
| parent | 26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff) | |
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/watchdog.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/kexec/crash.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index dfbce527c98e..e103b89234cd 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -171,7 +171,6 @@ extern void panic_flush_kmsg_start(void) extern void panic_flush_kmsg_end(void) { - printk_safe_flush_on_panic(); kmsg_dump(KMSG_DUMP_PANIC); bust_spinlocks(0); debug_locks_off(); diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index a165635fd214..f9ea0e5357f9 100644 --- a/arch/powerpc/kernel/watchdog.c +++ b/arch/powerpc/kernel/watchdog.c @@ -184,11 +184,6 @@ static void watchdog_smp_panic(int cpu, u64 tb) wd_smp_unlock(&flags); - printk_safe_flush(); - /* - * printk_safe_flush() seems to require another print - * before anything actually goes out to console. - */ if (sysctl_hardlockup_all_cpu_backtrace) trigger_allbutself_cpu_backtrace(); 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 |