diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-top.c | 2 | ||||
-rw-r--r-- | tools/perf/util/event.c | 4 | ||||
-rw-r--r-- | tools/perf/util/probe-event.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index c6706984b7b3..31f2e597800c 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -706,7 +706,7 @@ static void print_mapped_keys(void) | |||
706 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); | 706 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); |
707 | 707 | ||
708 | fprintf(stdout, | 708 | fprintf(stdout, |
709 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", | 709 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", |
710 | hide_kernel_symbols ? "yes" : "no"); | 710 | hide_kernel_symbols ? "yes" : "no"); |
711 | fprintf(stdout, | 711 | fprintf(stdout, |
712 | "\t[U] hide user symbols. \t(%s)\n", | 712 | "\t[U] hide user symbols. \t(%s)\n", |
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 9eb7005bc6d6..705ec63548b4 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -442,10 +442,10 @@ void thread__find_addr_map(struct thread *self, | |||
442 | al->thread = self; | 442 | al->thread = self; |
443 | al->addr = addr; | 443 | al->addr = addr; |
444 | 444 | ||
445 | if (cpumode & PERF_RECORD_MISC_KERNEL) { | 445 | if (cpumode == PERF_RECORD_MISC_KERNEL) { |
446 | al->level = 'k'; | 446 | al->level = 'k'; |
447 | mg = &session->kmaps; | 447 | mg = &session->kmaps; |
448 | } else if (cpumode & PERF_RECORD_MISC_USER) | 448 | } else if (cpumode == PERF_RECORD_MISC_USER) |
449 | al->level = '.'; | 449 | al->level = '.'; |
450 | else { | 450 | else { |
451 | al->level = 'H'; | 451 | al->level = 'H'; |
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 71b0dd590a37..a21b6bf055ac 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
@@ -310,6 +310,7 @@ int synthesize_perf_probe_point(struct probe_point *pp) | |||
310 | int ret; | 310 | int ret; |
311 | 311 | ||
312 | pp->probes[0] = buf = zalloc(MAX_CMDLEN); | 312 | pp->probes[0] = buf = zalloc(MAX_CMDLEN); |
313 | pp->found = 1; | ||
313 | if (!buf) | 314 | if (!buf) |
314 | die("Failed to allocate memory by zalloc."); | 315 | die("Failed to allocate memory by zalloc."); |
315 | if (pp->offset) { | 316 | if (pp->offset) { |
@@ -332,6 +333,7 @@ int synthesize_perf_probe_point(struct probe_point *pp) | |||
332 | error: | 333 | error: |
333 | free(pp->probes[0]); | 334 | free(pp->probes[0]); |
334 | pp->probes[0] = NULL; | 335 | pp->probes[0] = NULL; |
336 | pp->found = 0; | ||
335 | } | 337 | } |
336 | return ret; | 338 | return ret; |
337 | } | 339 | } |
@@ -494,6 +496,7 @@ void show_perf_probe_events(void) | |||
494 | struct str_node *ent; | 496 | struct str_node *ent; |
495 | 497 | ||
496 | setup_pager(); | 498 | setup_pager(); |
499 | memset(&pp, 0, sizeof(pp)); | ||
497 | 500 | ||
498 | fd = open_kprobe_events(O_RDONLY, 0); | 501 | fd = open_kprobe_events(O_RDONLY, 0); |
499 | rawlist = get_trace_kprobe_event_rawlist(fd); | 502 | rawlist = get_trace_kprobe_event_rawlist(fd); |