summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPierre Kuo <vichy.kuo@gmail.com>2017-07-11 14:40:55 +0800
committerPetr Mladek <pmladek@suse.com>2017-07-27 15:04:21 +0200
commitaec47caa747e1e15a3363dc0b0db37e51b8d4f15 (patch)
treebf92b7f202c4acbcaa226b2bd0a679016a6b7c46 /kernel
parenteed1fc87795362fd868bdc960d7b96d25f81eae3 (diff)
downloadlinux-stable-aec47caa747e1e15a3363dc0b0db37e51b8d4f15.tar.gz
linux-stable-aec47caa747e1e15a3363dc0b0db37e51b8d4f15.tar.bz2
linux-stable-aec47caa747e1e15a3363dc0b0db37e51b8d4f15.zip
printk: Modify operators of printed_len and text_len
With commit <ddb9baa82226> ("printk: report lost messages in printk safe/nmi contexts") and commit <8b1742c9c207> ("printk: remove zap_locks() function"), it seems we can remove initialization, "=0", of text_len and directly assign result of log_output to printed_len. Link: http://lkml.kernel.org/r/1499755255-6258-1-git-send-email-vichy.kuo@gmail.com Cc: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org Cc: joe@perches.com Signed-off-by: Pierre Kuo <vichy.kuo@gmail.com> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index fc47863f629c..229fbdcbe6ef 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1698,10 +1698,10 @@ asmlinkage int vprintk_emit(int facility, int level,
{
static char textbuf[LOG_LINE_MAX];
char *text = textbuf;
- size_t text_len = 0;
+ size_t text_len;
enum log_flags lflags = 0;
unsigned long flags;
- int printed_len = 0;
+ int printed_len;
bool in_sched = false;
if (level == LOGLEVEL_SCHED) {
@@ -1754,7 +1754,7 @@ asmlinkage int vprintk_emit(int facility, int level,
if (dict)
lflags |= LOG_PREFIX|LOG_NEWLINE;
- printed_len += log_output(facility, level, lflags, dict, dictlen, text, text_len);
+ printed_len = log_output(facility, level, lflags, dict, dictlen, text, text_len);
logbuf_unlock_irqrestore(flags);