summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-03 18:29:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-03 18:29:28 -0700
commit9c35baf6cee9a5745d55de6f9995916dde642517 (patch)
treec447401507ed48c36c08e40f1a508c6d0a5601d6 /init
parentdd23f273d9a765d7f092c1bb0d1cd7aaf668077e (diff)
parentcf39bf58afdaabc0b86f141630fb3fd18190294e (diff)
downloadlinux-9c35baf6cee9a5745d55de6f9995916dde642517.tar.gz
linux-9c35baf6cee9a5745d55de6f9995916dde642517.tar.bz2
linux-9c35baf6cee9a5745d55de6f9995916dde642517.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek: - There is a situation when early console is not deregistered because the preferred one matches a wrong entry. It caused messages to appear twice. This is the 2nd attempt to fix it. The first one was wrong, see the commit c6c7d83b9c9e ('Revert "console: don't prefer first registered if DT specifies stdout-path"'). The fix is coupled with some small code clean up. Well, the console registration code would deserve a big one. We need to think about it. - Do not lose information about the preemtive context when the console semaphore is re-taken. - Do not block CPU hotplug when someone else is already pushing messages to the console. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: printk: fix double printing with earlycon printk: rename selected_console -> preferred_console printk: fix name/type/scope of preferred_console var printk: Correctly handle preemption in console_unlock() printk: use console_trylock() in console_cpu_notify()
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions