2 files changed, 10 insertions, 8 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 22f437ff65e5..8c39615165b7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -861,17 +861,19 @@ config LOG_CPU_MAX_BUF_SHIFT
                      13 =>   8 KB for each CPU
                      12 =>   4 KB for each CPU
 
-config NMI_LOG_BUF_SHIFT
-        int "Temporary per-CPU NMI log buffer size (12 => 4KB, 13 => 8KB)"
+config PRINTK_SAFE_LOG_BUF_SHIFT
+        int "Temporary per-CPU printk log buffer size (12 => 4KB, 13 => 8KB)"
         range 10 21
         default 13
-        depends on PRINTK_NMI
+        depends on PRINTK
         help
-          Select the size of a per-CPU buffer where NMI messages are temporary
-          stored. They are copied to the main log buffer in a safe context
-          to avoid a deadlock. The value defines the size as a power of 2.
+          Select the size of an alternate printk per-CPU buffer where messages
+          printed from usafe contexts are temporary stored. One example would
+          be NMI messages, another one - printk recursion. The messages are
+          copied to the main log buffer in a safe context to avoid a deadlock.
+          The value defines the size as a power of 2.
 
-          NMI messages are rare and limited. The largest one is when
+          Those messages are rare and limited. The largest one is when
           a backtrace is printed. It usually fits into 4KB. Select
           8KB if you want to be on the safe side.
 
diff --git a/init/main.c b/init/main.c
index c8a00f0f10ff..24ea48745061 100644
--- a/init/main.c
+++ b/init/main.c
@@ -581,7 +581,7 @@ asmlinkage __visible void __init start_kernel(void)
         timekeeping_init();
         time_init();
         sched_clock_postinit();
-        printk_nmi_init();
+        printk_safe_init();
         perf_event_init();
         profile_init();
         call_function_init();