summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/parse-branch-options.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-10-26 19:02:35 -0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-10-28 11:29:45 -0200
commit46cb25b1a0ee74bf4a79cfb3081ae3567b2f7135 (patch)
tree4a9c4582fa25b2d59d0b8a67516d28b0f8da1776 /tools/perf/util/parse-branch-options.c
parent9a8860bbaa936407aa95d7d3ef836036a117b207 (diff)
downloadlinux-46cb25b1a0ee74bf4a79cfb3081ae3567b2f7135.tar.gz
linux-46cb25b1a0ee74bf4a79cfb3081ae3567b2f7135.tar.bz2
linux-46cb25b1a0ee74bf4a79cfb3081ae3567b2f7135.zip
perf tools: Add missing object file to the python binding linkage list
In ac12f6764c50 ("perf tools: Implement branch_type event parameter") we started using the parse_branch_str() function from one of the files used in the python binding, which caused this entry in 'perf test' to fail: # perf test -v python 16: Try 'import perf' in python, checking link problems : --- start --- test child forked, pid 16667 Traceback (most recent call last): File "<stdin>", line 1, in <module> ImportError: /tmp/build/perf/python/perf.so: undefined symbol: parse_branch_str test child finished with -1 ---- end ---- Try 'import perf' in python, checking link problems: FAILED! # I must've commited some mistake when running 'perf test' to send the pull request for the perf-core-for-mingo-20161024 tag, to have let this regression to pass, sigh. Just add tools/perf/util/parse-branch-options.c and switch from using ui__warning(), that is not available in the python binding, use pr_warning() instead, which is good enough for this case. Now: # perf test python 16: Try 'import perf' in python, checking link problems : Ok # Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Cc: Andi Kleen <ak@linux.intel.com> Fixes: ac12f6764c50 ("perf tools: Implement branch_type event parameter") Link: http://lkml.kernel.org/n/tip-9kn1ct1cx9ppwqlmzl6z0xhs@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/parse-branch-options.c')
-rw-r--r--tools/perf/util/parse-branch-options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-branch-options.c b/tools/perf/util/parse-branch-options.c
index 3634d6974300..38fd11504015 100644
--- a/tools/perf/util/parse-branch-options.c
+++ b/tools/perf/util/parse-branch-options.c
@@ -64,7 +64,7 @@ int parse_branch_str(const char *str, __u64 *mode)
}
if (!br->name) {
ret = -1;
- ui__warning("unknown branch filter %s,"
+ pr_warning("unknown branch filter %s,"
" check man page\n", s);
goto error;
}