diff options
author | Petr Mladek <pmladek@suse.com> | 2021-01-25 14:29:35 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2021-01-25 14:29:35 +0100 |
commit | 61bb17da44a0b6d079e68872e3569bb3eda17656 (patch) | |
tree | af46bca6bd344ed27cc66cd25f603f7ca9b74b01 /kernel/printk | |
parent | 535b6a122c6b43af5772ca39cbff7056749aae74 (diff) | |
parent | 08d60e5999540110576e7c1346d486220751b7f9 (diff) | |
download | linux-61bb17da44a0b6d079e68872e3569bb3eda17656.tar.gz linux-61bb17da44a0b6d079e68872e3569bb3eda17656.tar.bz2 linux-61bb17da44a0b6d079e68872e3569bb3eda17656.zip |
Merge branch 'printk-rework' into for-linus
Diffstat (limited to 'kernel/printk')
-rw-r--r-- | kernel/printk/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 6639a0cfe0ac..5a95c688621f 100644 --- 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; } |