2 files changed, 36 insertions, 1 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 62436bd5f34a..af614995b71d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -640,6 +640,20 @@
                         console=brl,ttyS0
                 For now, only VisioBraille is supported.
 
+        console_msg_format=
+                        [KNL] Change console messages format
+                default
+                        By default we print messages on consoles in
+                        "[time stamp] text\n" format (time stamp may not be
+                        printed, depending on CONFIG_PRINTK_TIME or
+                        `printk_time' param).
+                syslog
+                        Switch to syslog format: "<%u>[time stamp] text\n"
+                        IOW, each message will have a facility and loglevel
+                        prefix. The format is similar to one used by syslog()
+                        syscall, or to executing "dmesg -S --raw" or to reading
+                        from /proc/kmsg.
+
         consoleblank=   [KNL] The console blank (screen saver) timeout in
                         seconds. A value of 0 disables the blank timer.
                        Defaults to 0.
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 5d81206a572d..568729e0dc2c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -277,6 +277,13 @@ EXPORT_SYMBOL(console_set_on_cmdline);
 /* Flag: console code may call schedule() */
 static int console_may_schedule;
 
+enum con_msg_format_flags {
+        MSG_FORMAT_DEFAULT      = 0,
+        MSG_FORMAT_SYSLOG       = (1 << 0),
+};
+
+static int console_msg_format = MSG_FORMAT_DEFAULT;
+
 /*
  * The printk log buffer consists of a chain of concatenated variable
  * length records. Every record starts with a record header, containing
@@ -1913,6 +1920,17 @@ static int __add_preferred_console(char *name, int idx, char *options,
         c->index = idx;
         return 0;
 }
+
+static int __init console_msg_format_setup(char *str)
+{
+        if (!strcmp(str, "syslog"))
+                console_msg_format = MSG_FORMAT_SYSLOG;
+        if (!strcmp(str, "default"))
+                console_msg_format = MSG_FORMAT_DEFAULT;
+        return 1;
+}
+__setup("console_msg_format=", console_msg_format_setup);
+
 /*
  * Set up a console.  Called via do_early_param() in init/main.c
  * for each "console=" parameter in the boot command line.
@@ -2215,7 +2233,10 @@ skip:
                         goto skip;
                 }
 
-                len += msg_print_text(msg, false, text + len, sizeof(text) - len);
+                len += msg_print_text(msg,
+                                console_msg_format & MSG_FORMAT_SYSLOG,
+                                text + len,
+                                sizeof(text) - len);
                 if (nr_ext_console_drivers) {
                         ext_len = msg_print_ext_header(ext_text,
                                                 sizeof(ext_text),