summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-22 10:35:56 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-22 10:35:56 +0100
commitf79b163c42314a1f46f4bcc40a19c8a75cf1e7a3 (patch)
tree4b5c452857371ec488fde7b0126bc28c301ae620 /include/linux
parent244eb5c6ec62ccab59ecac1f4815bb33130c423a (diff)
downloadlinux-stable-f79b163c42314a1f46f4bcc40a19c8a75cf1e7a3.tar.gz
linux-stable-f79b163c42314a1f46f4bcc40a19c8a75cf1e7a3.tar.bz2
linux-stable-f79b163c42314a1f46f4bcc40a19c8a75cf1e7a3.zip
Revert "serial: 8250: Switch to nbcon console"
This reverts commit b63e6f60eab45b16a1bf734fef9035a4c4187cd5. kernel test robot has found problems with this commit so revert it for now. Link: https://lore.kernel.org/r/202501221029.fb0d574d-lkp@intel.com Reported-by: kernel test robot <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202501221029.fb0d574d-lkp@intel.com Cc: John Ogness <john.ogness@linutronix.de> Cc: Petr Mladek <pmladek@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_8250.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 57875c37023a..144de7a7948d 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -150,17 +150,8 @@ struct uart_8250_port {
#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
u16 lsr_saved_flags;
u16 lsr_save_mask;
-
- /*
- * Track when a console line has been fully written to the
- * hardware, i.e. true when the most recent byte written to
- * UART_TX by the console was '\n'.
- */
- bool console_line_ended;
-
#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
unsigned char msr_saved_flags;
- struct irq_work modem_status_work;
struct uart_8250_dma *dma;
const struct uart_8250_ops *ops;
@@ -211,8 +202,8 @@ void serial8250_tx_chars(struct uart_8250_port *up);
unsigned int serial8250_modem_status(struct uart_8250_port *up);
void serial8250_init_port(struct uart_8250_port *up);
void serial8250_set_defaults(struct uart_8250_port *up);
-void serial8250_console_write(struct uart_8250_port *up,
- struct nbcon_write_context *wctxt, bool in_atomic);
+void serial8250_console_write(struct uart_8250_port *up, const char *s,
+ unsigned int count);
int serial8250_console_setup(struct uart_port *port, char *options, bool probe);
int serial8250_console_exit(struct uart_port *port);