mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 17:57:38 -04:00
Merge tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek: - Use no_printk() instead of "if (0) printk()" constructs to avoid generating printk index for messages disabled at compile time - Remove deprecated strncpy/strcpy from printk.c - Remove redundant CONFIG_BASE_FULL in favor of CONFIG_BASE_SMALL * tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux: printk: cleanup deprecated uses of strncpy/strcpy printk: Remove redundant CONFIG_BASE_FULL printk: Change type of CONFIG_BASE_SMALL to bool printk: Fix LOG_CPU_MAX_BUF_SHIFT when BASE_SMALL is enabled ceph: Use no_printk() helper dyndbg: Use *no_printk() helpers dev_printk: Add and use dev_no_printk() printk: Let no_printk() use _printk()
This commit is contained in:
14
init/Kconfig
14
init/Kconfig
@@ -743,8 +743,8 @@ config LOG_CPU_MAX_BUF_SHIFT
|
||||
int "CPU kernel log buffer size contribution (13 => 8 KB, 17 => 128KB)"
|
||||
depends on SMP
|
||||
range 0 21
|
||||
default 12 if !BASE_SMALL
|
||||
default 0 if BASE_SMALL
|
||||
default 12
|
||||
depends on PRINTK
|
||||
help
|
||||
This option allows to increase the default ring buffer size
|
||||
@@ -1585,11 +1585,10 @@ config PCSPKR_PLATFORM
|
||||
This option allows to disable the internal PC-Speaker
|
||||
support, saving some memory.
|
||||
|
||||
config BASE_FULL
|
||||
default y
|
||||
bool "Enable full-sized data structures for core" if EXPERT
|
||||
config BASE_SMALL
|
||||
bool "Enable smaller-sized data structures for core" if EXPERT
|
||||
help
|
||||
Disabling this option reduces the size of miscellaneous core
|
||||
Enabling this option reduces the size of miscellaneous core
|
||||
kernel data structures. This saves memory on small machines,
|
||||
but may reduce performance.
|
||||
|
||||
@@ -1944,11 +1943,6 @@ config RT_MUTEXES
|
||||
bool
|
||||
default y if PREEMPT_RT
|
||||
|
||||
config BASE_SMALL
|
||||
int
|
||||
default 0 if BASE_FULL
|
||||
default 1 if !BASE_FULL
|
||||
|
||||
config MODULE_SIG_FORMAT
|
||||
def_bool n
|
||||
select SYSTEM_DATA_VERIFICATION
|
||||
|
||||
Reference in New Issue
Block a user