diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-01 10:06:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-01 10:06:39 -0800 |
| commit | 7bec4a96466286b0ad00e6394bbb94c1b3fd98f3 (patch) | |
| tree | 4f5bc0db50aa0f790157446a944cfb6beba2b662 | |
| parent | 16453c9cf855d088d5598cedb75229e9056b12b3 (diff) | |
| parent | c14376de3a1befa70d9811ca2872d47367b48767 (diff) | |
| download | linux-7bec4a96466286b0ad00e6394bbb94c1b3fd98f3.tar.bz2 | |
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
| -rw-r--r-- | kernel/printk/printk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fc1123583fa6..f274fbef821d 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -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(); } |