add new system file

hc

2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c

 kernel/drivers/tty/serial/sunzilog.c
..
..
@@ -40,10 +40,6 @@
40
40
 #include <asm/prom.h>
41
41
 #include <asm/setup.h>
42
42
 
43
-#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
44
-#define SUPPORT_SYSRQ
45
-#endif
46
-
47
43
 #include <linux/serial_core.h>
48
44
 #include <linux/sunserialcore.h>
49
45
 
..
..
@@ -310,7 +306,7 @@
310
306
 		switch (ret) {
311
307
 		case 2:
312
308
 			sunzilog_change_mouse_baud(up);
313
-			/* fallthru */
309
+			fallthrough;
314
310
 		case 1:
315
311
 			break;
316
312
 
..
..
@@ -1225,7 +1221,7 @@
1225
1221
 	int baud, brg;
1226
1222
 
1227
1223
 	if (up->port.type != PORT_SUNZILOG)
1228
-		return -1;
1224
+		return -EINVAL;
1229
1225
 
1230
1226
 	printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
1231
1227
 	       (sunzilog_reg.minor - 64) + con->index, con->index);
..
..
@@ -1444,6 +1440,7 @@
1444
1440
 	up[0].port.line = (inst * 2) + 0;
1445
1441
 	up[0].port.dev = &op->dev;
1446
1442
 	up[0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A;
1443
+	up[0].port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_SUNZILOG_CONSOLE);
1447
1444
 	if (keyboard_mouse)
1448
1445
 		up[0].flags |= SUNZILOG_FLAG_CONS_KEYB;
1449
1446
 	sunzilog_init_hw(&up[0]);
..
..
@@ -1461,6 +1458,7 @@
1461
1458
 	up[1].port.line = (inst * 2) + 1;
1462
1459
 	up[1].port.dev = &op->dev;
1463
1460
 	up[1].flags |= 0;
1461
+	up[1].port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_SUNZILOG_CONSOLE);
1464
1462
 	if (keyboard_mouse)
1465
1463
 		up[1].flags |= SUNZILOG_FLAG_CONS_MOUSE;
1466
1464
 	sunzilog_init_hw(&up[1]);