diff options
author | Borislav Petkov <bp@suse.de> | 2014-06-04 19:11:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:17 -0400 |
commit | a8fe19ebfbfd90ec17c02284717238b02efb9580 (patch) | |
tree | b0bcae3df8f0f739993ede45c81c031d32d5edcd /init/main.c | |
parent | 84b5ec8a9df86f3dcaaaf912715db35e4852d1da (diff) |
kernel/printk: use symbolic defines for console loglevels
... instead of naked numbers.
Stuff in sysrq.c used to set it to 8 which is supposed to mean above
default level so set it to DEBUG instead as we're terminating/killing all
tasks and we want to be verbose there.
Also, correct the check in x86_64_start_kernel which should be >= as
we're clearly issuing the string there for all debug levels, not only
the magical 10.
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Joe Perches <joe@perches.com>
Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index e08c0b2065a1..04fab8d74c89 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -203,13 +203,13 @@ EXPORT_SYMBOL(loops_per_jiffy); | |||
203 | 203 | ||
204 | static int __init debug_kernel(char *str) | 204 | static int __init debug_kernel(char *str) |
205 | { | 205 | { |
206 | console_loglevel = 10; | 206 | console_loglevel = CONSOLE_LOGLEVEL_DEBUG; |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | 209 | ||
210 | static int __init quiet_kernel(char *str) | 210 | static int __init quiet_kernel(char *str) |
211 | { | 211 | { |
212 | console_loglevel = 4; | 212 | console_loglevel = CONSOLE_LOGLEVEL_QUIET; |
213 | return 0; | 213 | return 0; |
214 | } | 214 | } |
215 | 215 | ||