write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/tty/serial/zs.c
..
..
@@ -44,10 +44,6 @@
44
44
  * complicated and prevents the use of some automatic modes of operation.
45
45
  */
46
46
 
47
-#if defined(CONFIG_SERIAL_ZS_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
48
-#define SUPPORT_SYSRQ
49
-#endif
50
-
51
47
 #include <linux/bug.h>
52
48
 #include <linux/console.h>
53
49
 #include <linux/delay.h>
..
..
@@ -992,7 +988,7 @@
992
988
 static int zs_map_port(struct uart_port *uport)
993
989
 {
994
990
 	if (!uport->membase)
995
-		uport->membase = ioremap_nocache(uport->mapbase,
991
+		uport->membase = ioremap(uport->mapbase,
996
992
 						 ZS_CHAN_IO_SIZE);
997
993
 	if (!uport->membase) {
998
994
 		printk(KERN_ERR "zs: Cannot map MMIO\n");
..
..
@@ -1106,6 +1102,7 @@
1106
1102
 			zport->scc	= &zs_sccs[chip];
1107
1103
 			zport->clk_mode	= 16;
1108
1104
 
1105
+			uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_ZS_CONSOLE);
1109
1106
 			uport->irq	= zs_parms.irq[chip];
1110
1107
 			uport->uartclk	= ZS_CLOCK;
1111
1108
 			uport->fifosize	= 1;