summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2023-11-02 13:00:20 +0100
committerPetr Mladek <pmladek@suse.com>2023-11-02 13:00:20 +0100
commitadb982ad4b9d691f707061fbe90eff80d391a0ef (patch)
tree91ff57e4b3c028e0d0102f2ecf41b69904e9ce62 /kernel
parent9277abd2c17272ed8fc1b842d9efa45797435b77 (diff)
parent72fcce70faf06dd7442bf0b41b71f071d7fa29a4 (diff)
Merge branch 'for-6.7' into for-linus
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 0b3af1529778..a8fab94f4c04 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1669,7 +1669,6 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
prb_rec_init_rd(&r, &info, text, PRINTK_MESSAGE_MAX);
- len = 0;
prb_for_each_record(seq, prb, seq, &r) {
int textlen;
@@ -4194,7 +4193,6 @@ bool kmsg_dump_get_buffer(struct kmsg_dump_iter *iter, bool syslog,
prb_rec_init_rd(&r, &info, buf, size);
- len = 0;
prb_for_each_record(seq, prb, seq, &r) {
if (r.info->seq >= iter->next_seq)
break;