hc
2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad
kernel/tools/perf/arch/s390/annotate/instructions.c
....@@ -7,7 +7,7 @@
77 char *endptr, *tok, *name;
88 struct map *map = ms->map;
99 struct addr_map_symbol target = {
10
- .map = map,
10
+ .ms = { .map = map, },
1111 };
1212
1313 tok = strchr(ops->raw, ',');
....@@ -38,15 +38,15 @@
3838 return -1;
3939 target.addr = map__objdump_2mem(map, ops->target.addr);
4040
41
- if (map_groups__find_ams(&target) == 0 &&
42
- map__rip_2objdump(target.map, map->map_ip(target.map, target.addr)) == ops->target.addr)
43
- ops->target.sym = target.sym;
41
+ if (maps__find_ams(ms->maps, &target) == 0 &&
42
+ map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
43
+ ops->target.sym = target.ms.sym;
4444
4545 return 0;
4646 }
4747
4848 static int call__scnprintf(struct ins *ins, char *bf, size_t size,
49
- struct ins_operands *ops);
49
+ struct ins_operands *ops, int max_ins_name);
5050
5151 static struct ins_ops s390_call_ops = {
5252 .parse = s390_call__parse,
....@@ -100,8 +100,6 @@
100100 return -1;
101101 }
102102
103
-static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
104
- struct ins_operands *ops);
105103
106104 static struct ins_ops s390_mov_ops = {
107105 .parse = s390_mov__parse,
....@@ -166,8 +164,10 @@
166164 if (!arch->initialized) {
167165 arch->initialized = true;
168166 arch->associate_instruction_ops = s390__associate_ins_ops;
169
- if (cpuid)
170
- err = s390__cpuid_parse(arch, cpuid);
167
+ if (cpuid) {
168
+ if (s390__cpuid_parse(arch, cpuid))
169
+ err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING;
170
+ }
171171 }
172172
173173 return err;