Merge branch 'rework/printk_safe-removal' into for-linus

2021-08-30 16:36:10 +02:00
parent 715d3edb79 26d1982fd1
commit c985aafb60
14 changed files with 192 additions and 544 deletions
--- 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