diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
| commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
| tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /tools/perf/builtin-annotate.c | |
| parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | linux-a52079dad4718fa924ae81a939f8a665366f562b.tar.xz | |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
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; } |