Commit 42a9dc0b authored by Alex Elder's avatar Alex Elder Committed by Linus Torvalds

printk: rename DEFAULT_MESSAGE_LOGLEVEL

Commit a8fe19eb ("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: default avatarAlex 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e97e1267
...@@ -31,7 +31,7 @@ static inline const char *printk_skip_level(const char *buffer) ...@@ -31,7 +31,7 @@ static inline const char *printk_skip_level(const char *buffer)
} }
/* printk's without a loglevel use this.. */ /* 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.. */ /* We show everything that is MORE important than this.. */
#define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
int console_printk[4] = { int console_printk[4] = {
CONSOLE_LOGLEVEL_DEFAULT, /* console_loglevel */ 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_MIN, /* minimum_console_loglevel */
CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */ CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */
}; };
......
...@@ -15,7 +15,7 @@ config PRINTK_TIME ...@@ -15,7 +15,7 @@ config PRINTK_TIME
The behavior is also controlled by the kernel command line The behavior is also controlled by the kernel command line
parameter printk.time=1. See Documentation/kernel-parameters.txt parameter printk.time=1. See Documentation/kernel-parameters.txt
config DEFAULT_MESSAGE_LOGLEVEL config MESSAGE_LOGLEVEL_DEFAULT
int "Default message log level (1-7)" int "Default message log level (1-7)"
range 1 7 range 1 7
default "4" default "4"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment