The patch titled
Subject: printk: rename DEFAULT_MESSAGE_LOGLEVEL
has been added to the -mm tree. Its filename is
printk-rename-default_message_loglevel.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/printk-rename-default_message_loglevel.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/printk-rename-default_message_loglevel.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Alex Elder <elder@xxxxxxxxxx>
Subject: printk: rename DEFAULT_MESSAGE_LOGLEVEL
a8fe19ebfbfd9 ("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@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/printk.h | 2 +-
kernel/printk/printk.c | 2 +-
lib/Kconfig.debug | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN include/linux/printk.h~printk-rename-default_message_loglevel include/linux/printk.h
--- a/include/linux/printk.h~printk-rename-default_message_loglevel
+++ a/include/linux/printk.h
@@ -31,7 +31,7 @@ static inline const char *printk_skip_le
}
/* 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 */
diff -puN kernel/printk/printk.c~printk-rename-default_message_loglevel kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-rename-default_message_loglevel
+++ a/kernel/printk/printk.c
@@ -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 */
};
diff -puN lib/Kconfig.debug~printk-rename-default_message_loglevel lib/Kconfig.debug
--- a/lib/Kconfig.debug~printk-rename-default_message_loglevel
+++ a/lib/Kconfig.debug
@@ -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"
_
Patches currently in -mm which might be from elder@xxxxxxxxxx are
printk-tweak-do_syslog-to-match-comments.patch
printk-rename-default_message_loglevel.patch
printk-fix-some-comments.patch
printk-use-a-clever-macro.patch
printk-miscellaneous-cleanups.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
