diff options
author | James Morris <james.l.morris@oracle.com> | 2015-11-23 14:46:28 +0300 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-11-23 14:46:28 +0300 |
commit | ebd68df3f24b318d391d15c458d6f43f340ba36a (patch) | |
tree | f0277bc4b853abe5db1d30fa4e10b05bba7f2ac5 /tools/perf/builtin-annotate.c | |
parent | e42852bf88144affc227884b62637118ba74b783 (diff) | |
parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
download | linux-ebd68df3f24b318d391d15c458d6f43f340ba36a.tar.xz |
Sync to Linus v4.4-rc2 for LSM developers.
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 8edc205ff9a7..2bf9b3fd9e61 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -211,7 +211,7 @@ static int __cmd_annotate(struct perf_annotate *ann) } if (!objdump_path) { - ret = perf_session_env__lookup_objdump(&session->header.env); + ret = perf_env__lookup_objdump(&session->header.env); if (ret) goto out; } |