summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-08-21 16:57:50 +0200
committerIngo Molnar <mingo@kernel.org>2012-08-21 16:57:50 +0200
commitf5042d037544215de530a375431c3fca60140823 (patch)
tree3f2b2df3469f86f5cdad087c3234f7ab4303e636
parent5c65ca75209de8cc1802e7d3761b404957689cda (diff)
parent3ab484b8622b7b890ca8d2ab5ee034c217ee4eeb (diff)
downloadlinux-3.10-f5042d037544215de530a375431c3fca60140823.tar.gz
linux-3.10-f5042d037544215de530a375431c3fca60140823.tar.bz2
linux-3.10-f5042d037544215de530a375431c3fca60140823.zip
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo: * Add missing object files needed to use the python binding, cherry-picked from perf/core, got a report it affects Linus's tree too, fix it. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--tools/perf/util/python-ext-sources2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index 2884e67ee62..213362850ab 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -10,10 +10,12 @@ util/ctype.c
util/evlist.c
util/evsel.c
util/cpumap.c
+util/hweight.c
util/thread_map.c
util/util.c
util/xyarray.c
util/cgroup.c
util/debugfs.c
+util/rblist.c
util/strlist.c
../../lib/rbtree.c