update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/powerpc/xmon/xmon.c
..
..
@@ -58,6 +58,7 @@
58
58
 #ifdef CONFIG_PPC64
59
59
 #include <asm/hvcall.h>
60
60
 #include <asm/paca.h>
61
+#include <asm/lppaca.h>
61
62
 #endif
62
63
 
63
64
 #include "nonstdio.h"
..
..
@@ -1383,7 +1384,6 @@
1383
1384
 	return 1;
1384
1385
 }
1385
1386
 
1386
-#ifndef CONFIG_PPC_8xx
1387
1387
 static int find_free_data_bpt(void)
1388
1388
 {
1389
1389
 	int i;
..
..
@@ -1395,7 +1395,6 @@
1395
1395
 	printf("Couldn't find free breakpoint register\n");
1396
1396
 	return -1;
1397
1397
 }
1398
-#endif
1399
1398
 
1400
1399
 static void print_data_bpts(void)
1401
1400
 {
..
..
@@ -1435,10 +1434,9 @@
1435
1434
 	cmd = inchar();
1436
1435
 
1437
1436
 	switch (cmd) {
1438
-#ifndef CONFIG_PPC_8xx
1439
-	static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n";
1440
-	int mode;
1441
-	case 'd':	/* bd - hardware data breakpoint */
1437
+	case 'd': {	/* bd - hardware data breakpoint */
1438
+		static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n";
1439
+		int mode;
1442
1440
 		if (xmon_is_ro) {
1443
1441
 			printf(xmon_ro_msg);
1444
1442
 			break;
..
..
@@ -1471,6 +1469,7 @@
1471
1469
 
1472
1470
 		force_enable_xmon();
1473
1471
 		break;
1472
+	}
1474
1473
 
1475
1474
 	case 'i':	/* bi - hardware instr breakpoint */
1476
1475
 		if (xmon_is_ro) {
..
..
@@ -1497,7 +1496,6 @@
1497
1496
 			force_enable_xmon();
1498
1497
 		}
1499
1498
 		break;
1500
-#endif
1501
1499
 
1502
1500
 	case 'c':
1503
1501
 		if (!scanhex(&a)) {