From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Hurley <peter@hurleysoftware.com>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [PATCH 1/2] printk: drop call_console_drivers() unused param
Date: Sat, 24 Dec 2016 23:09:01 +0900 [thread overview]
Message-ID: <20161224140902.1962-2-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20161224140902.1962-1-sergey.senozhatsky@gmail.com>
We do suppress_message_printing() check before we call
call_console_drivers() now, so `level' param is not needed
anymore.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
kernel/printk/printk.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e2cdd87e7a63..11a9842a2f47 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1510,8 +1510,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;
@@ -1895,8 +1894,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; }
@@ -2220,7 +2218,6 @@ void console_unlock(void)
struct printk_log *msg;
size_t ext_len = 0;
size_t len;
- int level;
raw_spin_lock_irqsave(&logbuf_lock, flags);
if (seen_seq != log_next_seq) {
@@ -2243,8 +2240,7 @@ void console_unlock(void)
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
@@ -2270,7 +2266,7 @@ void console_unlock(void)
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();
local_irq_restore(flags);
--
2.11.0
next prev parent reply other threads:[~2016-12-24 14:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-24 14:09 [PATCH 0/2] printk: always report dropped messages Sergey Senozhatsky
2016-12-24 14:09 ` Sergey Senozhatsky [this message]
2017-01-03 10:22 ` [PATCH 1/2] printk: drop call_console_drivers() unused param Petr Mladek
2017-01-09 13:49 ` Petr Mladek
2016-12-24 14:09 ` [PATCH 2/2] printk: always report lost messages on serial console Sergey Senozhatsky
2017-01-03 14:55 ` Petr Mladek
2017-01-03 15:47 ` Sergey Senozhatsky
2017-01-03 16:53 ` Petr Mladek
2017-01-04 2:46 ` Sergey Senozhatsky
2017-01-04 10:52 ` Petr Mladek
2017-01-04 13:34 ` Sergey Senozhatsky
2017-01-04 15:26 ` Petr Mladek
2017-01-05 2:30 ` Sergey Senozhatsky
2017-01-05 10:53 ` Petr Mladek
2017-01-09 16:56 ` Petr Mladek
2017-01-10 8:49 ` Sergey Senozhatsky
2017-01-11 16:50 ` Petr Mladek
2017-01-13 5:11 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161224140902.1962-2-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter@hurleysoftware.com \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®