|
@@ -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),
|