printk: Don't bother using LOG_CPU_MAX_BUF_SHIFT on !SMP
PATCH 1/1 printk: Don't bother using LOG_CPU_MAX_BUF_SHIFT on !SMP
When configuring a uniprocessor kernel, don't bother the user with an irrelevant LOG_CPU_MAX_BUF_SHIFT question, and don't build the unused code.
Signed-off-by Geert Uytterhoeven <[email protected]>
--- init/Kconfig | 1 + kernel/printk/printk.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
init/Kconfig +1 -0
@@ -822,6 +822,7 @@ config LOG_BUF_SHIFT 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
kernel/printk/printk.c +6 -1
@@ -267,7 +267,6 @@ static u32 clear_idx;#define LOG_ALIGN __alignof__(struct printk_log)#endif #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) -#define __LOG_CPU_MAX_BUF_LEN (1 << CONFIG_LOG_CPU_MAX_BUF_SHIFT)static char __log_buf[__LOG_BUF_LEN]__aligned(LOG_ALIGN) ;static char *log_buf = __log_buf;static u32 log_buf_len = __LOG_BUF_LEN;
@@ -846,6 +845,9 @@ static int __init log_buf_len_setup(char *str) }early_param ("log_buf_len" , log_buf_len_setup); +#ifdef CONFIG_SMP +#define __LOG_CPU_MAX_BUF_LEN (1 << CONFIG_LOG_CPU_MAX_BUF_SHIFT) +static void __init log_buf_add_cpu (void ) {unsigned int cpu_extra;
@@ -872,6 +874,9 @@ static void __init log_buf_add_cpu(void) log_buf_len_update(cpu_extra + __LOG_BUF_LEN); } +#else /* !CONFIG_SMP */ +static inline void log_buf_add_cpu (void ) {} +#endif /* CONFIG_SMP */ void __init setup_log_buf (int early) {
Signature · 1 line
1.9.1
Quoted 5 lines · Geert Uytterhoeven
When configuring a uniprocessor kernel, don't bother the user with an irrelevant
LOG_CPU_MAX_BUF_SHIFTquestion, and don't build the unused code.Signed-off-by Geert Uytterhoeven <[email protected]>
Luis