diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-11-27 13:41:23 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-11-27 13:41:23 +0100 |
| commit | 739e7116b10bf8694795ed8365dd7cbe089b662a (patch) | |
| tree | 67984c08d2eb57d734e0d9fc096b5e8b15032728 | |
| parent | 90574a9c02f1ed46d9d8fec222fbcf375eb90e9b (diff) | |
| parent | 4ad9921af4f18490980369f7d60f90ade0195812 (diff) | |
| download | linux-739e7116b10bf8694795ed8365dd7cbe089b662a.tar.bz2 | |
Merge branch 'for-5.10-pr_cont-fixup' into for-linus
| -rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fe64a49344bf..bc1e3b5a97bd 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -528,8 +528,8 @@ static int log_store(u32 caller_id, int facility, int level, if (dev_info) memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info)); - /* insert message */ - if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE)) + /* A message without a trailing newline can be continued. */ + if (!(flags & LOG_NEWLINE)) prb_commit(&e); else prb_final_commit(&e); |