diff options
| author | Thomas Meyer <thomas@m3y3r.de> | 2021-01-07 11:05:31 +0300 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-01-27 00:11:37 +0300 |
| commit | e23fe90dec286cd77e9059033aa640fc45603602 (patch) | |
| tree | 05cbb94820b2662273d6710446037739bc798902 /arch/um | |
| parent | d7ffac33631b2f72ec4cbbf9a64be6aa011b5cfd (diff) | |
| download | linux-e23fe90dec286cd77e9059033aa640fc45603602.tar.xz | |
um: kmsg_dumper: always dump when not tty console
With the addition of the ttynull console driver, the chance that a
console driver was already registerd did increase. Refine the logic when
to dump the kernel message buffer: always dump the buffer, when the UML
stdio console driver is not active and the preferred console.
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/kmsg_dump.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/um/kernel/kmsg_dump.c b/arch/um/kernel/kmsg_dump.c index e4abac6c9727..6516ef1f8274 100644 --- a/arch/um/kernel/kmsg_dump.c +++ b/arch/um/kernel/kmsg_dump.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/kmsg_dump.h> #include <linux/console.h> +#include <linux/string.h> #include <shared/init.h> #include <shared/kern.h> #include <os.h> @@ -16,8 +17,12 @@ static void kmsg_dumper_stdout(struct kmsg_dumper *dumper, if (!console_trylock()) return; - for_each_console(con) - break; + for_each_console(con) { + if(strcmp(con->name, "tty") == 0 && + (con->flags & (CON_ENABLED | CON_CONSDEV)) != 0) { + break; + } + } console_unlock(); |