write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/tty/serial/mux.c
..
..
@@ -25,11 +25,7 @@
25
25
 #include <asm/irq.h>
26
26
 #include <asm/parisc-device.h>
27
27
 
28
-#if defined(CONFIG_SERIAL_MUX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
29
28
 #include <linux/sysrq.h>
30
-#define SUPPORT_SYSRQ
31
-#endif
32
-
33
29
 #include <linux/serial_core.h>
34
30
 
35
31
 #define MUX_OFFSET 0x800
..
..
@@ -474,7 +470,7 @@
474
470
 		port->iobase	= 0;
475
471
 		port->mapbase	= dev->hpa.start + MUX_OFFSET +
476
472
 						(i * MUX_LINE_OFFSET);
477
-		port->membase	= ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);
473
+		port->membase	= ioremap(port->mapbase, MUX_LINE_OFFSET);
478
474
 		port->iotype	= UPIO_MEM;
479
475
 		port->type	= PORT_MUX;
480
476
 		port->irq	= 0;
..
..
@@ -483,6 +479,7 @@
483
479
 		port->ops	= &mux_pops;
484
480
 		port->flags	= UPF_BOOT_AUTOCONF;
485
481
 		port->line	= port_cnt;
482
+		port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_MUX_CONSOLE);
486
483
 
487
484
 		/* The port->timeout needs to match what is present in
488
485
 		 * uart_wait_until_sent in serial_core.c.  Otherwise