disable pwm7

hc

2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a

 kernel/tools/perf/util/demangle-java.c
..
..
@@ -1,21 +1,21 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
2
 #include <sys/types.h>
3
3
 #include <stdio.h>
4
+#include <stdlib.h>
4
5
 #include <string.h>
5
-#include "util.h"
6
-#include "debug.h"
7
6
 #include "symbol.h"
8
7
 
9
8
 #include "demangle-java.h"
10
9
 
11
-#include "sane_ctype.h"
10
+#include <linux/ctype.h>
11
+#include <linux/kernel.h>
12
12
 
13
13
 enum {
14
14
 	MODE_PREFIX = 0,
15
15
 	MODE_CLASS  = 1,
16
16
 	MODE_FUNC   = 2,
17
17
 	MODE_TYPE   = 3,
18
-	MODE_CTYPE  = 3, /* class arg */
18
+	MODE_CTYPE  = 4, /* class arg */
19
19
 };
20
20
 
21
21
 #define BASE_ENT(c, n)	[c - 'A']=n
..
..
@@ -27,7 +27,7 @@
27
27
 	BASE_ENT('I', "int" ),
28
28
 	BASE_ENT('J', "long" ),
29
29
 	BASE_ENT('S', "short" ),
30
-	BASE_ENT('Z', "bool" ),
30
+	BASE_ENT('Z', "boolean" ),
31
31
 };
32
32
 
33
33
 /*
..
..
@@ -59,15 +59,16 @@
59
59
 
60
60
 		switch (*q) {
61
61
 		case 'L':
62
-			if (mode == MODE_PREFIX || mode == MODE_CTYPE) {
63
-				if (mode == MODE_CTYPE) {
62
+			if (mode == MODE_PREFIX || mode == MODE_TYPE) {
63
+				if (mode == MODE_TYPE) {
64
64
 					if (narg)
65
65
 						rlen += scnprintf(buf + rlen, maxlen - rlen, ", ");
66
66
 					narg++;
67
67
 				}
68
-				rlen += scnprintf(buf + rlen, maxlen - rlen, "class ");
69
68
 				if (mode == MODE_PREFIX)
70
69
 					mode = MODE_CLASS;
70
+				else
71
+					mode = MODE_CTYPE;
71
72
 			} else
72
73
 				buf[rlen++] = *q;
73
74
 			break;
..
..
@@ -120,7 +121,7 @@
120
121
 			if (mode != MODE_CLASS && mode != MODE_CTYPE)
121
122
 				goto error;
122
123
 			/* safe because at least one other char to process */
123
-			if (isalpha(*(q + 1)))
124
+			if (isalpha(*(q + 1)) && mode == MODE_CLASS)
124
125
 				rlen += scnprintf(buf + rlen, maxlen - rlen, ".");
125
126
 			if (mode == MODE_CLASS)
126
127
 				mode = MODE_FUNC;