Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

After the commit 93d102f094be9beab2 ("printk: remove safe buffers"),
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT is no longer useful.  Remove it.

Signed-off-by: Marc Aurèle La France <tsi@tuyoix.net>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
[pmladek@suse.cz: Cleaned up the commit message.]
Signed-off-by: Petr Mladek <pmladek@suse.com>
Fixes: 93d102f094be9beab ("printk: remove safe buffers")
Link: https://lore.kernel.org/r/5c19e248-1b6b-330c-7c4c-a824688daefe@tuyoix.net

diff --git a/arch/powerpc/configs/microwatt_defconfig b/arch/powerpc/configs/microwatt_defconfig
index 18d4fe4108cb6331795a68b30d37bef135fbd03a..795a127908e7dabab954a2f11f9e18a9151f9281 100644 (file)
--- a/arch/powerpc/configs/microwatt_defconfig
+++ b/arch/powerpc/configs/microwatt_defconfig
@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_CGROUPS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y

diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig
index 79b3ccd58ff0310b0700d371b1a093bcd307a513..e36fffd6fb1802e668cb52843b9b9d26b92842f1 100644 (file)
--- a/arch/riscv/configs/nommu_k210_defconfig
+++ b/arch/riscv/configs/nommu_k210_defconfig
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=13
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set

diff --git a/arch/riscv/configs/nommu_k210_sdcard_defconfig b/arch/riscv/configs/nommu_k210_sdcard_defconfig
index 6b80bb13b8edd960e1879984afa9fd3799b47aff..c1ad85f0a4f73be95a452edcf58d9517dc7d4429 100644 (file)
--- a/arch/riscv/configs/nommu_k210_sdcard_defconfig
+++ b/arch/riscv/configs/nommu_k210_sdcard_defconfig
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=13
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SYSFS_SYSCALL is not set
 # CONFIG_FHANDLE is not set

diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig
index 4cf0f297091e720f888cfe8c701db766572d6247..b794e2f8144e665dd26dc05cc2b56908b46262b6 100644 (file)
--- a/arch/riscv/configs/nommu_virt_defconfig
+++ b/arch/riscv/configs/nommu_virt_defconfig
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set

diff --git a/init/Kconfig b/init/Kconfig
index 77a4318a60431eef5f24a3b5ca22ca26190d94a5..77c89142e44fb27bf8e1d80cfe140995bba1f012 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -769,30 +769,6 @@ config LOG_CPU_MAX_BUF_SHIFT
                     13 =>   8 KB for each CPU
                     12 =>   4 KB for each CPU
 
-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
-       help
-         Select the size of an alternate printk per-CPU buffer where messages
-         printed from unsafe 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.
-
-         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.
-
-         Examples:
-                    17 => 128 KB for each CPU
-                    16 =>  64 KB for each CPU
-                    15 =>  32 KB for each CPU
-                    14 =>  16 KB for each CPU
-                    13 =>   8 KB for each CPU
-                    12 =>   4 KB for each CPU
-
 config PRINTK_INDEX
        bool "Printk indexing debugfs interface"
        depends on PRINTK && DEBUG_FS