Commit 9277abd2 authored by Petr Mladek's avatar Petr Mladek
Browse files

Merge branch 'rework/misc-cleanups' into for-linus

parents 01a46efc 054c22bd

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();