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 ddc584b64871..4b91d8cf00ec 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
| @@ -705,7 +705,7 @@ static void print_mapped_keys(void) | |||
| 705 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); | 705 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); |
| 706 | 706 | ||
| 707 | fprintf(stdout, | 707 | fprintf(stdout, |
| 708 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", | 708 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", |
| 709 | hide_kernel_symbols ? "yes" : "no"); | 709 | hide_kernel_symbols ? "yes" : "no"); |
| 710 | fprintf(stdout, | 710 | fprintf(stdout, |
| 711 | "\t[U] hide user symbols. \t(%s)\n", | 711 | "\t[U] hide user symbols. \t(%s)\n", |
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index bb0fd6da2d56..8a9e6baa3099 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
| @@ -295,10 +295,10 @@ void thread__find_addr_location(struct thread *self, | |||
| 295 | al->thread = self; | 295 | al->thread = self; |
| 296 | al->addr = addr; | 296 | al->addr = addr; |
| 297 | 297 | ||
| 298 | if (cpumode & PERF_RECORD_MISC_KERNEL) { | 298 | if (cpumode == PERF_RECORD_MISC_KERNEL) { |
| 299 | al->level = 'k'; | 299 | al->level = 'k'; |
| 300 | mg = &session->kmaps; | 300 | mg = &session->kmaps; |
| 301 | } else if (cpumode & PERF_RECORD_MISC_USER) | 301 | } else if (cpumode == PERF_RECORD_MISC_USER) |
| 302 | al->level = '.'; | 302 | al->level = '.'; |
| 303 | else { | 303 | else { |
| 304 | al->level = 'H'; | 304 | al->level = 'H'; |
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 29465d440043..fde17b090a47 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
| @@ -272,6 +272,7 @@ int synthesize_perf_probe_point(struct probe_point *pp) | |||
| 272 | int ret; | 272 | int ret; |
| 273 | 273 | ||
| 274 | pp->probes[0] = buf = zalloc(MAX_CMDLEN); | 274 | pp->probes[0] = buf = zalloc(MAX_CMDLEN); |
| 275 | pp->found = 1; | ||
| 275 | if (!buf) | 276 | if (!buf) |
| 276 | die("Failed to allocate memory by zalloc."); | 277 | die("Failed to allocate memory by zalloc."); |
| 277 | if (pp->offset) { | 278 | if (pp->offset) { |
| @@ -294,6 +295,7 @@ int synthesize_perf_probe_point(struct probe_point *pp) | |||
| 294 | error: | 295 | error: |
| 295 | free(pp->probes[0]); | 296 | free(pp->probes[0]); |
| 296 | pp->probes[0] = NULL; | 297 | pp->probes[0] = NULL; |
| 298 | pp->found = 0; | ||
| 297 | } | 299 | } |
| 298 | return ret; | 300 | return ret; |
| 299 | } | 301 | } |
| @@ -455,6 +457,7 @@ void show_perf_probe_events(void) | |||
| 455 | struct strlist *rawlist; | 457 | struct strlist *rawlist; |
| 456 | struct str_node *ent; | 458 | struct str_node *ent; |
| 457 | 459 | ||
| 460 | memset(&pp, 0, sizeof(pp)); | ||
| 458 | fd = open_kprobe_events(O_RDONLY, 0); | 461 | fd = open_kprobe_events(O_RDONLY, 0); |
| 459 | rawlist = get_trace_kprobe_event_rawlist(fd); | 462 | rawlist = get_trace_kprobe_event_rawlist(fd); |
| 460 | close(fd); | 463 | close(fd); |
