diff options
-rw-r--r-- | tools/perf/util/bpf-event.c | 2 | ||||
-rw-r--r-- | tools/perf/util/event.c | 6 | ||||
-rw-r--r-- | tools/perf/util/event.h | 2 | ||||
-rw-r--r-- | tools/perf/util/machine.c | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index 3be8c480fa1f..69795c32ecf3 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c | |||
@@ -161,7 +161,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, | |||
161 | union perf_event *event, | 161 | union perf_event *event, |
162 | struct record_opts *opts) | 162 | struct record_opts *opts) |
163 | { | 163 | { |
164 | struct perf_record_ksymbol *ksymbol_event = &event->ksymbol_event; | 164 | struct perf_record_ksymbol *ksymbol_event = &event->ksymbol; |
165 | struct perf_record_bpf_event *bpf_event = &event->bpf_event; | 165 | struct perf_record_bpf_event *bpf_event = &event->bpf_event; |
166 | struct bpf_prog_info_linear *info_linear; | 166 | struct bpf_prog_info_linear *info_linear; |
167 | struct perf_tool *tool = session->tool; | 167 | struct perf_tool *tool = session->tool; |
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 4447cd25e3f2..bdeaad434e52 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -1486,9 +1486,9 @@ static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp) | |||
1486 | size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp) | 1486 | size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp) |
1487 | { | 1487 | { |
1488 | return fprintf(fp, " addr %" PRI_lx64 " len %u type %u flags 0x%x name %s\n", | 1488 | return fprintf(fp, " addr %" PRI_lx64 " len %u type %u flags 0x%x name %s\n", |
1489 | event->ksymbol_event.addr, event->ksymbol_event.len, | 1489 | event->ksymbol.addr, event->ksymbol.len, |
1490 | event->ksymbol_event.ksym_type, | 1490 | event->ksymbol.ksym_type, |
1491 | event->ksymbol_event.flags, event->ksymbol_event.name); | 1491 | event->ksymbol.flags, event->ksymbol.name); |
1492 | } | 1492 | } |
1493 | 1493 | ||
1494 | size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp) | 1494 | size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp) |
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 25f5309a3442..34190e01f307 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h | |||
@@ -561,7 +561,7 @@ union perf_event { | |||
561 | struct perf_record_throttle throttle; | 561 | struct perf_record_throttle throttle; |
562 | struct perf_record_sample sample; | 562 | struct perf_record_sample sample; |
563 | struct perf_record_bpf_event bpf_event; | 563 | struct perf_record_bpf_event bpf_event; |
564 | struct perf_record_ksymbol ksymbol_event; | 564 | struct perf_record_ksymbol ksymbol; |
565 | struct attr_event attr; | 565 | struct attr_event attr; |
566 | struct event_update_event event_update; | 566 | struct event_update_event event_update; |
567 | struct event_type_event event_type; | 567 | struct event_type_event event_type; |
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 823aaf7b1b83..86b7fd24b1e1 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c | |||
@@ -713,20 +713,20 @@ static int machine__process_ksymbol_register(struct machine *machine, | |||
713 | struct symbol *sym; | 713 | struct symbol *sym; |
714 | struct map *map; | 714 | struct map *map; |
715 | 715 | ||
716 | map = map_groups__find(&machine->kmaps, event->ksymbol_event.addr); | 716 | map = map_groups__find(&machine->kmaps, event->ksymbol.addr); |
717 | if (!map) { | 717 | if (!map) { |
718 | map = dso__new_map(event->ksymbol_event.name); | 718 | map = dso__new_map(event->ksymbol.name); |
719 | if (!map) | 719 | if (!map) |
720 | return -ENOMEM; | 720 | return -ENOMEM; |
721 | 721 | ||
722 | map->start = event->ksymbol_event.addr; | 722 | map->start = event->ksymbol.addr; |
723 | map->end = map->start + event->ksymbol_event.len; | 723 | map->end = map->start + event->ksymbol.len; |
724 | map_groups__insert(&machine->kmaps, map); | 724 | map_groups__insert(&machine->kmaps, map); |
725 | } | 725 | } |
726 | 726 | ||
727 | sym = symbol__new(map->map_ip(map, map->start), | 727 | sym = symbol__new(map->map_ip(map, map->start), |
728 | event->ksymbol_event.len, | 728 | event->ksymbol.len, |
729 | 0, 0, event->ksymbol_event.name); | 729 | 0, 0, event->ksymbol.name); |
730 | if (!sym) | 730 | if (!sym) |
731 | return -ENOMEM; | 731 | return -ENOMEM; |
732 | dso__insert_symbol(map->dso, sym); | 732 | dso__insert_symbol(map->dso, sym); |
@@ -739,7 +739,7 @@ static int machine__process_ksymbol_unregister(struct machine *machine, | |||
739 | { | 739 | { |
740 | struct map *map; | 740 | struct map *map; |
741 | 741 | ||
742 | map = map_groups__find(&machine->kmaps, event->ksymbol_event.addr); | 742 | map = map_groups__find(&machine->kmaps, event->ksymbol.addr); |
743 | if (map) | 743 | if (map) |
744 | map_groups__remove(&machine->kmaps, map); | 744 | map_groups__remove(&machine->kmaps, map); |
745 | 745 | ||
@@ -753,7 +753,7 @@ int machine__process_ksymbol(struct machine *machine __maybe_unused, | |||
753 | if (dump_trace) | 753 | if (dump_trace) |
754 | perf_event__fprintf_ksymbol(event, stdout); | 754 | perf_event__fprintf_ksymbol(event, stdout); |
755 | 755 | ||
756 | if (event->ksymbol_event.flags & PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER) | 756 | if (event->ksymbol.flags & PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER) |
757 | return machine__process_ksymbol_unregister(machine, event, | 757 | return machine__process_ksymbol_unregister(machine, event, |
758 | sample); | 758 | sample); |
759 | return machine__process_ksymbol_register(machine, event, sample); | 759 | return machine__process_ksymbol_register(machine, event, sample); |