printk: rename DEFAULT_MESSAGE_LOGLEVEL (42a9dc0b) · Commits · 戴 / test

Commit ("kernel/printk: use symbolic defines for console loglevels") makes consistent use of symbolic values for printk() log levels. The naming scheme used is different from the one used for DEFAULT_MESSAGE_LOGLEVEL though. Change that symbol name to be MESSAGE_LOGLEVEL_DEFAULT for consistency. And because the value of that symbol comes from a similarly-named config option, rename CONFIG_DEFAULT_MESSAGE_LOGLEVEL as well. Signed-off-by:

Alex Elder <elder@linaro.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: Jan Kara <jack@suse.cz> Cc: John Stultz <john.stultz@linaro.org> Cc: Petr Mladek <pmladek@suse.cz> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/printk.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ static inline const char printk_skip_level(const char buffer)
		}

		/* printk's without a loglevel use this.. */
		#define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
		#define MESSAGE_LOGLEVEL_DEFAULT CONFIG_MESSAGE_LOGLEVEL_DEFAULT

		/* We show everything that is MORE important than this.. */
		#define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */

kernel/printk/printk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@

		int console_printk[4] = {
		CONSOLE_LOGLEVEL_DEFAULT, /* console_loglevel */
		DEFAULT_MESSAGE_LOGLEVEL, /* default_message_loglevel */
		MESSAGE_LOGLEVEL_DEFAULT, /* default_message_loglevel */
		CONSOLE_LOGLEVEL_MIN, /* minimum_console_loglevel */
		CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */
		};

lib/Kconfig.debug

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ config PRINTK_TIME
		The behavior is also controlled by the kernel command line
		parameter printk.time=1. See Documentation/kernel-parameters.txt

		config DEFAULT_MESSAGE_LOGLEVEL
		config MESSAGE_LOGLEVEL_DEFAULT
		int "Default message log level (1-7)"
		range 1 7
		default "4"

Admin message