diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 10:45:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 10:45:11 -0800 |
| commit | d3eb52113d162cc88975fbd03c9e6f9cf2f8a771 (patch) | |
| tree | 7ef2b73e6174d355d625c2a05377b14c0939cca7 /include | |
| parent | 5e60366d56c630e32befce7ef05c569e04391ca3 (diff) | |
| parent | 5ed37174e6c7e1ed4abfd0d8e932a3044441fb5f (diff) | |
Merge tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek:
- Finally allow parallel writes and reads into/from the lockless
ringbuffer. But it is not a complete solution. Readers are still
serialized against each other. And nested writes are still prevented
by printk_safe per-CPU buffers.
- Use ttynull as the ultimate fallback for /dev/console.
- Officially allow disabling console output by using console="" or
console=null
- A few code cleanups
* tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: remove logbuf_lock writer-protection of ringbuffer
printk: inline log_output(),log_store() in vprintk_store()
printk: remove obsolete dead assignment
printk/console: Allow to disable console output by using console="" or console=null
init/console: Use ttynull as a fallback when there is no console
printk: ringbuffer: Reference text_data_ring directly in callees.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 20874db50bc8..dbe78e8e2602 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -186,9 +186,12 @@ extern int braille_register_console(struct console *, int index, extern int braille_unregister_console(struct console *); #ifdef CONFIG_TTY extern void console_sysfs_notify(void); +extern void register_ttynull_console(void); #else static inline void console_sysfs_notify(void) { } +static inline void register_ttynull_console(void) +{ } #endif extern bool console_suspend_enabled; |