From ca0f3468f4c2b9c9025c6addcdf3cd5b5568dcb0 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 9 Jul 2000 21:12:59 +0000 Subject: [PATCH] Serial driver fixes, sent to Linus. --- drivers/char/serial.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/char/serial.c b/drivers/char/serial.c index fbbc8271c60..105137a9281 100644 --- a/drivers/char/serial.c +++ b/drivers/char/serial.c @@ -258,6 +258,8 @@ static struct rs_multiport_struct rs_multiport[NR_IRQS]; static int IRQ_timeout[NR_IRQS]; #ifdef CONFIG_SERIAL_CONSOLE static struct console sercons; +#endif +#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE) static unsigned long break_pressed; /* break, really ... */ #endif @@ -2048,7 +2050,7 @@ static int set_serial_info(struct async_struct * info, new_port = new_serial.port; if (HIGH_BITS_OFFSET) - new_port += new_serial.port_high << HIGH_BITS_OFFSET; + new_port += (unsigned long) new_serial.port_high << HIGH_BITS_OFFSET; change_irq = new_serial.irq != state->irq; change_port = (new_port != ((int) state->port)) || @@ -5173,7 +5175,7 @@ int register_serial(struct serial_struct *req) port = req->port; if (HIGH_BITS_OFFSET) - port += req->port_high << HIGH_BITS_OFFSET; + port += (unsigned long) req->port_high << HIGH_BITS_OFFSET; save_flags(flags); cli(); for (i = 0; i < NR_PORTS; i++) { -- 2.11.4.GIT