diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 09:56:27 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 09:56:27 (GMT) |
| commit | f7dc7fd1c08c6d8109688694fd93d80645df89ff (patch) | |
| tree | 255e1e24bcf089d584e45ea8a733883c1bb4d74c /tools/perf/builtin-top.c | |
| parent | 32b0ed3ae66cd6114f8510161f833f05518c0395 (diff) | |
| parent | 44b11fee51711ca85aa2b121a49bf029d18a3722 (diff) | |
| download | linux-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Conflicts:
tools/perf/builtin-kmem.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-top.c')
| -rw-r--r-- | tools/perf/builtin-top.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 2326583..a193517 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -733,7 +733,7 @@ static void perf_event__process_sample(struct perf_tool *tool, "Kernel address maps (/proc/{kallsyms,modules}) are restricted.\n\n" "Check /proc/sys/kernel/kptr_restrict.\n\n" "Kernel%s samples will not be resolved.\n", - !RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION]) ? + al.map && !RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION]) ? " modules" : ""); if (use_browser <= 0) sleep(5); |