diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-12-14 15:14:57 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-12-14 15:14:57 +0100 |
| commit | 5f3b8d398601055f29f32986a94d55955cd48f09 (patch) | |
| tree | 9d1ccae747f39c27ecaff8e23f8e760d996ae2ee /drivers/tty | |
| parent | b031a684bfd01d633c79d281bd0cf11c2f834ada (diff) | |
| parent | 3cffa06aeef7ece30f6b5ac0ea51f264e8fea4d0 (diff) | |
Merge branch 'for-5.11-null-console' into for-linus
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 3 | ||||
| -rw-r--r-- | drivers/tty/ttynull.c | 18 |
3 files changed, 19 insertions, 16 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index 93fd984eb2f5..ca359bbd62f5 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -428,20 +428,6 @@ config MIPS_EJTAG_FDC_KGDB_CHAN help FDC channel number to use for KGDB. -config NULL_TTY - tristate "NULL TTY driver" - help - Say Y here if you want a NULL TTY which simply discards messages. - - This is useful to allow userspace applications which expect a console - device to work without modifications even when no console is - available or desired. - - In order to use this driver, you should redirect the console to this - TTY, or boot the kernel with console=ttynull. - - If unsure, say N. - config TRACE_ROUTER tristate "Trace data router for MIPI P1149.7 cJTAG standard" depends on TRACE_SINK diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 020b1cd9294f..f6b6bee0422d 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_TTY) += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ tty_buffer.o tty_port.o tty_mutex.o \ tty_ldsem.o tty_baudrate.o tty_jobctrl.o \ - n_null.o + n_null.o ttynull.o obj-$(CONFIG_LEGACY_PTYS) += pty.o obj-$(CONFIG_UNIX98_PTYS) += pty.o obj-$(CONFIG_AUDIT) += tty_audit.o @@ -25,7 +25,6 @@ obj-$(CONFIG_ISI) += isicom.o obj-$(CONFIG_MOXA_INTELLIO) += moxa.o obj-$(CONFIG_MOXA_SMARTIO) += mxser.o obj-$(CONFIG_NOZOMI) += nozomi.o -obj-$(CONFIG_NULL_TTY) += ttynull.o obj-$(CONFIG_ROCKETPORT) += rocket.o obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o diff --git a/drivers/tty/ttynull.c b/drivers/tty/ttynull.c index 17f05b7eb6d3..eced70ec54e1 100644 --- a/drivers/tty/ttynull.c +++ b/drivers/tty/ttynull.c @@ -2,6 +2,13 @@ /* * Copyright (C) 2019 Axis Communications AB * + * The console is useful for userspace applications which expect a console + * device to work without modifications even when no console is available + * or desired. + * + * In order to use this driver, you should redirect the console to this + * TTY, or boot the kernel with console=ttynull. + * * Based on ttyprintk.c: * Copyright (C) 2010 Samo Pogacnik */ @@ -59,6 +66,17 @@ static struct console ttynull_console = { .device = ttynull_device, }; +void __init register_ttynull_console(void) +{ + if (!ttynull_driver) + return; + + if (add_preferred_console(ttynull_console.name, 0, NULL)) + return; + + register_console(&ttynull_console); +} + static int __init ttynull_init(void) { struct tty_driver *driver; |