Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

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
This commit is contained in:
Linus Torvalds 2018-03-01 10:06:39 -08:00
Родитель 16453c9cf8 c14376de3a
Коммит 7bec4a9646
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

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