Skip to content

Commit 7312b74

Browse files
committed
Revert "serial: core: Fix ifdef for serial base console functions"
This reverts commit b20172c. 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>
1 parent ea55c65 commit 7312b74

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/tty/serial/serial_base_bus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name,
219219
return ret;
220220
}
221221

222+
#endif
223+
222224
#ifdef __sparc__
223225

224226
/* Handle Sparc ttya and ttyb options as done in console_setup() */
@@ -317,8 +319,6 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
317319
return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line);
318320
}
319321

320-
#endif
321-
322322
#ifdef CONFIG_SERIAL_8250_CONSOLE
323323

324324
/*

0 commit comments

Comments
 (0)