|
@@ -1558,8 +1558,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
|
|
|
* log_buf[start] to log_buf[end - 1].
|
|
|
* The console_lock must be held.
|
|
|
*/
|
|
|
-static void call_console_drivers(int level,
|
|
|
- const char *ext_text, size_t ext_len,
|
|
|
+static void call_console_drivers(const char *ext_text, size_t ext_len,
|
|
|
const char *text, size_t len)
|
|
|
{
|
|
|
struct console *con;
|
|
@@ -1866,8 +1865,7 @@ static ssize_t msg_print_ext_header(char *buf, size_t size,
|
|
|
static ssize_t msg_print_ext_body(char *buf, size_t size,
|
|
|
char *dict, size_t dict_len,
|
|
|
char *text, size_t text_len) { return 0; }
|
|
|
-static void call_console_drivers(int level,
|
|
|
- const char *ext_text, size_t ext_len,
|
|
|
+static void call_console_drivers(const char *ext_text, size_t ext_len,
|
|
|
const char *text, size_t len) {}
|
|
|
static size_t msg_print_text(const struct printk_log *msg,
|
|
|
bool syslog, char *buf, size_t size) { return 0; }
|
|
@@ -2188,7 +2186,6 @@ again:
|
|
|
struct printk_log *msg;
|
|
|
size_t ext_len = 0;
|
|
|
size_t len;
|
|
|
- int level;
|
|
|
|
|
|
printk_safe_enter_irqsave(flags);
|
|
|
raw_spin_lock(&logbuf_lock);
|
|
@@ -2212,8 +2209,7 @@ skip:
|
|
|
break;
|
|
|
|
|
|
msg = log_from_idx(console_idx);
|
|
|
- level = msg->level;
|
|
|
- if (suppress_message_printing(level)) {
|
|
|
+ if (suppress_message_printing(msg->level)) {
|
|
|
/*
|
|
|
* Skip record we have buffered and already printed
|
|
|
* directly to the console when we received it, and
|
|
@@ -2239,7 +2235,7 @@ skip:
|
|
|
raw_spin_unlock(&logbuf_lock);
|
|
|
|
|
|
stop_critical_timings(); /* don't trace print latency */
|
|
|
- call_console_drivers(level, ext_text, ext_len, text, len);
|
|
|
+ call_console_drivers(ext_text, ext_len, text, len);
|
|
|
start_critical_timings();
|
|
|
printk_safe_exit_irqrestore(flags);
|
|
|
|