diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-27 09:15:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-27 09:15:48 +0200 |
| commit | 07394b5f13a04f86b27e0ddd96a36c7d9bfe1a4f (patch) | |
| tree | 684f1103022db370242cc21199ca3cd5985eaac1 /tools/perf/builtin-annotate.c | |
| parent | cf8102f64c8d23f0bd4af0659bbd94d0c1d8d1c7 (diff) | |
| parent | 49757c9cc7887bc79f742eb8aacf16e464ca5f0b (diff) | |
| download | linux-07394b5f13a04f86b27e0ddd96a36c7d9bfe1a4f.tar.gz linux-07394b5f13a04f86b27e0ddd96a36c7d9bfe1a4f.tar.bz2 linux-07394b5f13a04f86b27e0ddd96a36c7d9bfe1a4f.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
o Restore "--callchain graph" output, broken in recent cset to end
up being the same as "fractal" (Namhyung Kim)
o Allow profiling when kptr_restrict == 1 for non root users,
kernel samples will just remain unresolved (Andi Kleen)
o Allow configuring default options for callchains in config file (Namhyung Kim)
o Fix line number in the config file error message (Jiri Olsa)
o Fix --per-core on multi socket systems (Andi Kleen)
Cleanups:
o Use ACCESS_ONCE() instead of volatile cast. (Pranith Kumar)
o Modify error code for when perf_session__new() fails (Taeung Song)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index d4da6929597f..be5939418425 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -340,7 +340,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) annotate.session = perf_session__new(&file, false, &annotate.tool); if (annotate.session == NULL) - return -ENOMEM; + return -1; symbol_conf.priv_size = sizeof(struct annotation); symbol_conf.try_vmlinux_path = true; |