diff options
-rw-r--r-- | tools/perf/builtin-kmem.c | 4 | ||||
-rw-r--r-- | tools/perf/builtin-sched.c | 2 | ||||
-rw-r--r-- | tools/perf/util/evsel_fprintf.c | 1 | ||||
-rw-r--r-- | tools/perf/util/machine.c | 2 | ||||
-rw-r--r-- | tools/perf/util/symbol_fprintf.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 29f4751a3574..6da8d083e4e5 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
@@ -1065,7 +1065,7 @@ static void __print_page_alloc_result(struct perf_session *session, int n_lines) | |||
1065 | 1065 | ||
1066 | data = rb_entry(next, struct page_stat, node); | 1066 | data = rb_entry(next, struct page_stat, node); |
1067 | sym = machine__find_kernel_function(machine, data->callsite, &map); | 1067 | sym = machine__find_kernel_function(machine, data->callsite, &map); |
1068 | if (sym && sym->name) | 1068 | if (sym) |
1069 | caller = sym->name; | 1069 | caller = sym->name; |
1070 | else | 1070 | else |
1071 | scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite); | 1071 | scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite); |
@@ -1107,7 +1107,7 @@ static void __print_page_caller_result(struct perf_session *session, int n_lines | |||
1107 | 1107 | ||
1108 | data = rb_entry(next, struct page_stat, node); | 1108 | data = rb_entry(next, struct page_stat, node); |
1109 | sym = machine__find_kernel_function(machine, data->callsite, &map); | 1109 | sym = machine__find_kernel_function(machine, data->callsite, &map); |
1110 | if (sym && sym->name) | 1110 | if (sym) |
1111 | caller = sym->name; | 1111 | caller = sym->name; |
1112 | else | 1112 | else |
1113 | scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite); | 1113 | scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite); |
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index daceb3202200..270eb2d8ca6b 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
@@ -2067,7 +2067,7 @@ static void save_task_callchain(struct perf_sched *sched, | |||
2067 | break; | 2067 | break; |
2068 | 2068 | ||
2069 | sym = node->sym; | 2069 | sym = node->sym; |
2070 | if (sym && sym->name) { | 2070 | if (sym) { |
2071 | if (!strcmp(sym->name, "schedule") || | 2071 | if (!strcmp(sym->name, "schedule") || |
2072 | !strcmp(sym->name, "__schedule") || | 2072 | !strcmp(sym->name, "__schedule") || |
2073 | !strcmp(sym->name, "preempt_schedule")) | 2073 | !strcmp(sym->name, "preempt_schedule")) |
diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c index 6b2925542c0a..4ef5184819a0 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c | |||
@@ -168,7 +168,6 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, | |||
168 | 168 | ||
169 | if (symbol_conf.bt_stop_list && | 169 | if (symbol_conf.bt_stop_list && |
170 | node->sym && | 170 | node->sym && |
171 | node->sym->name && | ||
172 | strlist__has_entry(symbol_conf.bt_stop_list, | 171 | strlist__has_entry(symbol_conf.bt_stop_list, |
173 | node->sym->name)) { | 172 | node->sym->name)) { |
174 | break; | 173 | break; |
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 747a034d1ff3..a1043cf9b89c 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c | |||
@@ -1565,7 +1565,7 @@ int machine__process_event(struct machine *machine, union perf_event *event, | |||
1565 | 1565 | ||
1566 | static bool symbol__match_regex(struct symbol *sym, regex_t *regex) | 1566 | static bool symbol__match_regex(struct symbol *sym, regex_t *regex) |
1567 | { | 1567 | { |
1568 | if (sym->name && !regexec(regex, sym->name, 0, NULL, 0)) | 1568 | if (!regexec(regex, sym->name, 0, NULL, 0)) |
1569 | return 1; | 1569 | return 1; |
1570 | return 0; | 1570 | return 0; |
1571 | } | 1571 | } |
diff --git a/tools/perf/util/symbol_fprintf.c b/tools/perf/util/symbol_fprintf.c index 7c6b33e8e2d2..63694e174e5c 100644 --- a/tools/perf/util/symbol_fprintf.c +++ b/tools/perf/util/symbol_fprintf.c | |||
@@ -21,7 +21,7 @@ size_t __symbol__fprintf_symname_offs(const struct symbol *sym, | |||
21 | unsigned long offset; | 21 | unsigned long offset; |
22 | size_t length; | 22 | size_t length; |
23 | 23 | ||
24 | if (sym && sym->name) { | 24 | if (sym) { |
25 | length = fprintf(fp, "%s", sym->name); | 25 | length = fprintf(fp, "%s", sym->name); |
26 | if (al && print_offsets) { | 26 | if (al && print_offsets) { |
27 | if (al->addr < sym->end) | 27 | if (al->addr < sym->end) |