aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Elder <elder@linaro.org>2014-07-09 07:15:17 -0500
committerAlex Elder <elder@linaro.org>2014-07-09 09:03:42 -0500
commitcb64c5c0527dadf17939d85e9ea416b1d3dd6376 (patch)
treefbde442d44936d77884bc20c8706af4998a5c0d3
parented61f7d2d5a4bb46dfba63508f2cf162b879eb8f (diff)
printk: rename DEFAULT_MESSAGE_LOGLEVELllct/capri-support
This 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. Note that we don't rename CONFIG_DEFAULT_MESSAGE_LOGLEVEL (to avoid breaking existing config files that might reference it). Signed-off-by: Alex Elder <elder@linaro.org>
-rw-r--r--include/linux/printk.h2
-rw-r--r--kernel/printk/printk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 319ff7e53ef..3d1ccadf09e 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -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_DEFAULT_MESSAGE_LOGLEVEL
/* We show everything that is MORE important than this.. */
#define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b44e6bd50c2..922e5483bff 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -57,7 +57,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 */
};