Commit 4524565e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1c8b86a3 9277abd2

kernel/printk/printk.c

+7 −1
Original line number Diff line number Diff line
@@ -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();