Merge branch 'printk-rework' into for-linus

pmladek · pmladek · commit 61bb17da44a0 · 2021-01-25T14:29:35.000+01:00
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
@@ -1398,7 +1398,7 @@ static size_t record_print_text(struct printk_record *r, bool syslog,
 	 * not counted in the return value.
 	 */
 	if (buf_size > 0)
-		text[len] = 0;
+		r->text_buf[len] = 0;
 
 	return len;
 }

Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ static size_t record_print_text(struct printk_record *r, bool syslog,`
`1398`	`1398`	`* not counted in the return value.`
`1399`	`1399`	`*/`
`1400`	`1400`	`if (buf_size > 0)`
`1401`		`- text[len] = 0;`
	`1401`	`+ r->text_buf[len] = 0;`
`1402`	`1402`
`1403`	`1403`	`return len;`
`1404`	`1404`	`}`