diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-11 23:15:16 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-11 23:15:16 +0300 |
commit | 4524565e3a3821a40eea029d05846f7de6588857 (patch) | |
tree | 96e54458c580140e9e394628fa845c9ffa355e77 /kernel | |
parent | 1c8b86a3799f7e5be903c3f49fcdaee29fd385b5 (diff) | |
parent | 9277abd2c17272ed8fc1b842d9efa45797435b77 (diff) | |
download | linux-4524565e3a3821a40eea029d05846f7de6588857.tar.xz |
Merge tag 'printk-for-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk regression fix from Petr Mladek:
- Avoid unnecessary wait and try to flush messages before checking
pending ones
* tag 'printk-for-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: flush consoles before checking progress
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk/printk.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 7e0b4dd02398..0b3af1529778 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3740,12 +3740,18 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre seq = prb_next_seq(prb); + /* Flush the consoles so that records up to @seq are printed. */ + console_lock(); + console_unlock(); + for (;;) { diff = 0; /* * Hold the console_lock to guarantee safe access to - * console->seq. + * console->seq. Releasing console_lock flushes more + * records in case @seq is still not printed on all + * usable consoles. */ console_lock(); |