Skip to content

Commit

Permalink
Revert "printk: Don't try to parse DEVNAME:0.0 console options"
Browse files Browse the repository at this point in the history
This reverts commit 8a831c5.

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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 25, 2024
1 parent deb091c commit 64f9f01
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 64f9f01

Please sign in to comment.