summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-25 07:58:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-25 07:58:07 +0200
commit64f9f010c6177dd4f33e5023d2eab9af4af291e9 (patch)
treeef33f46db25fd196cf108844b3025311029e0fd2 /kernel
parentdeb091cb05a2b8555e15fcc2df5a0dcd9d06fea0 (diff)
Revert "printk: Don't try to parse DEVNAME:0.0 console options"
This reverts commit 8a831c584e6e80cf68f79893dc395c16cdf47dc8. Let's roll back all of the serial core and printk console changes that went into 6.10-rc1 as there still are problems with them that need to be sorted out. Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1 Reported-by: Petr Mladek <pmladek@suse.com> Reported-by: Tony Lindgren <tony@atomide.com> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: John Ogness <john.ogness@linutronix.de> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e6e6a47acec8..b582404cd29d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2504,10 +2504,6 @@ static int __init console_setup(char *str)
if (console_opt_save(str, brl_options))
return 1;
- /* Don't attempt to parse a DEVNAME:0.0 style console */
- if (strchr(str, ':'))
- return 1;
-
/*
* Decode str into name, index, options.
*/