Commit 7bec4a96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull printk fix from Petr Mladek:
 "Make sure that we wake up userspace loggers. This fixes a race
  introduced by the console waiter logic during this merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  printk: Wake klogd when passing console_lock owner
parents 16453c9c c14376de
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ skip:

		if (console_lock_spinning_disable_and_check()) {
			printk_safe_exit_irqrestore(flags);
			return;
			goto out;
		}

		printk_safe_exit_irqrestore(flags);
@@ -2430,6 +2430,7 @@ skip:
	if (retry && console_trylock())
		goto again;

out:
	if (wake_klogd)
		wake_up_klogd();
}