diff options
-rw-r--r-- | include/linux/kernel.h | 2 | ||||
-rw-r--r-- | kernel/printk.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 066bb1eddfea..1b2e1747df1a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -97,6 +97,8 @@ extern const char linux_proc_banner[]; | |||
97 | #define KERN_INFO "<6>" /* informational */ | 97 | #define KERN_INFO "<6>" /* informational */ |
98 | #define KERN_DEBUG "<7>" /* debug-level messages */ | 98 | #define KERN_DEBUG "<7>" /* debug-level messages */ |
99 | 99 | ||
100 | /* Use the default kernel loglevel */ | ||
101 | #define KERN_DEFAULT "<d>" | ||
100 | /* | 102 | /* |
101 | * Annotation for a "continued" line of log printout (only done after a | 103 | * Annotation for a "continued" line of log printout (only done after a |
102 | * line that had no enclosing \n). Only to be used by core/arch code | 104 | * line that had no enclosing \n). Only to be used by core/arch code |
diff --git a/kernel/printk.c b/kernel/printk.c index a87770ce73a2..b4d97b54c1ec 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -696,6 +696,8 @@ asmlinkage int vprintk(const char *fmt, va_list args) | |||
696 | switch (c) { | 696 | switch (c) { |
697 | case '0' ... '7': /* loglevel */ | 697 | case '0' ... '7': /* loglevel */ |
698 | current_log_level = c - '0'; | 698 | current_log_level = c - '0'; |
699 | /* Fallthrough - make sure we're on a new line */ | ||
700 | case 'd': /* KERN_DEFAULT */ | ||
699 | if (!new_text_line) { | 701 | if (!new_text_line) { |
700 | emit_log_char('\n'); | 702 | emit_log_char('\n'); |
701 | new_text_line = 1; | 703 | new_text_line = 1; |