Skip to content

Commit 0c705be

Browse files
Marc Aurèle La Francepmladek
authored andcommitted
Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
After the commit 93d102f ("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: 93d102f ("printk: remove safe buffers") Link: https://lore.kernel.org/r/5c19e248-1b6b-330c-7c4c-a824688daefe@tuyoix.net
1 parent d876315 commit 0c705be

File tree

5 files changed

+0
-28
lines changed

5 files changed

+0
-28
lines changed

arch/powerpc/configs/microwatt_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y
44
CONFIG_PREEMPT_VOLUNTARY=y
55
CONFIG_TICK_CPU_ACCOUNTING=y
66
CONFIG_LOG_BUF_SHIFT=16
7-
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
87
CONFIG_CGROUPS=y
98
CONFIG_BLK_DEV_INITRD=y
109
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

arch/riscv/configs/nommu_k210_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# CONFIG_CPU_ISOLATION is not set
22
CONFIG_LOG_BUF_SHIFT=13
3-
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
43
CONFIG_BLK_DEV_INITRD=y
54
# CONFIG_RD_GZIP is not set
65
# CONFIG_RD_BZIP2 is not set

arch/riscv/configs/nommu_k210_sdcard_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# CONFIG_CPU_ISOLATION is not set
22
CONFIG_LOG_BUF_SHIFT=13
3-
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
43
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
54
# CONFIG_SYSFS_SYSCALL is not set
65
# CONFIG_FHANDLE is not set

arch/riscv/configs/nommu_virt_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# CONFIG_CPU_ISOLATION is not set
22
CONFIG_LOG_BUF_SHIFT=16
3-
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
43
CONFIG_BLK_DEV_INITRD=y
54
# CONFIG_RD_BZIP2 is not set
65
# CONFIG_RD_LZMA is not set

init/Kconfig

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -769,30 +769,6 @@ config LOG_CPU_MAX_BUF_SHIFT
769769
13 => 8 KB for each CPU
770770
12 => 4 KB for each CPU
771771

772-
config PRINTK_SAFE_LOG_BUF_SHIFT
773-
int "Temporary per-CPU printk log buffer size (12 => 4KB, 13 => 8KB)"
774-
range 10 21
775-
default 13
776-
depends on PRINTK
777-
help
778-
Select the size of an alternate printk per-CPU buffer where messages
779-
printed from unsafe contexts are temporary stored. One example would
780-
be NMI messages, another one - printk recursion. The messages are
781-
copied to the main log buffer in a safe context to avoid a deadlock.
782-
The value defines the size as a power of 2.
783-
784-
Those messages are rare and limited. The largest one is when
785-
a backtrace is printed. It usually fits into 4KB. Select
786-
8KB if you want to be on the safe side.
787-
788-
Examples:
789-
17 => 128 KB for each CPU
790-
16 => 64 KB for each CPU
791-
15 => 32 KB for each CPU
792-
14 => 16 KB for each CPU
793-
13 => 8 KB for each CPU
794-
12 => 4 KB for each CPU
795-
796772
config PRINTK_INDEX
797773
bool "Printk indexing debugfs interface"
798774
depends on PRINTK && DEBUG_FS

0 commit comments

Comments
 (0)