diff options
author | Mandeep Singh Baines <msb@chromium.org> | 2011-03-22 19:34:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 20:44:13 -0400 |
commit | 5af5bcb8d37f99ba415a1adc6da71051b84f93a5 (patch) | |
tree | 58ae14d126ef40cbc5a91538cfe04433d26510ae | |
parent | 9f36e2c448007b54851e7e4fa48da97d1477a175 (diff) |
printk: allow setting DEFAULT_MESSAGE_LEVEL via Kconfig
We've been burned by regressions/bugs which we later realized could have
been triaged quicker if only we'd paid closer attention to dmesg. To make
it easier to audit dmesg, we'd like to make DEFAULT_MESSAGE_LEVEL
Kconfig-settable. That way we can set it to KERN_NOTICE and audit any
messages <= KERN_WARNING.
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joe Perches <joe@perches.com>
Cc: Olof Johansson <olofj@chromium.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/printk.c | 2 | ||||
-rw-r--r-- | lib/Kconfig.debug | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index a53607eea6d0..da8ca817eae3 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -53,7 +53,7 @@ void asmlinkage __attribute__((weak)) early_printk(const char *fmt, ...) | |||
53 | #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) | 53 | #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) |
54 | 54 | ||
55 | /* printk's without a loglevel use this.. */ | 55 | /* printk's without a loglevel use this.. */ |
56 | #define DEFAULT_MESSAGE_LOGLEVEL 4 /* KERN_WARNING */ | 56 | #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL |
57 | 57 | ||
58 | /* We show everything that is MORE important than this.. */ | 58 | /* We show everything that is MORE important than this.. */ |
59 | #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ | 59 | #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index fb0afeff9436..bef5faab660f 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -9,6 +9,17 @@ config PRINTK_TIME | |||
9 | operations. This is useful for identifying long delays | 9 | operations. This is useful for identifying long delays |
10 | in kernel startup. | 10 | in kernel startup. |
11 | 11 | ||
12 | config DEFAULT_MESSAGE_LOGLEVEL | ||
13 | int "Default message log level (1-7)" | ||
14 | range 1 7 | ||
15 | default "4" | ||
16 | help | ||
17 | Default log level for printk statements with no specified priority. | ||
18 | |||
19 | This was hard-coded to KERN_WARNING since at least 2.6.10 but folks | ||
20 | that are auditing their logs closely may want to set it to a lower | ||
21 | priority. | ||
22 | |||
12 | config ENABLE_WARN_DEPRECATED | 23 | config ENABLE_WARN_DEPRECATED |
13 | bool "Enable __deprecated logic" | 24 | bool "Enable __deprecated logic" |
14 | default y | 25 | default y |