summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/evlist.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-11 09:28:31 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-11 09:28:31 +0100
commit137ee20ddd10fdc20600c389fe63edab0c39cb1a (patch)
treef2f9db93cbbe1929d2c3380658a546a748181dc9 /tools/perf/util/evlist.h
parent4a0b1665db09cf2da9ad7d0f12da386373c10bfa (diff)
parent1c0b04d10bbe35279c50e3b36cf5b8ec2a0050d8 (diff)
downloadlinux-137ee20ddd10fdc20600c389fe63edab0c39cb1a.tar.bz2
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/util/evlist.h')
-rw-r--r--tools/perf/util/evlist.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 078d51256085..8b1cb7a4c5f1 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -38,8 +38,8 @@ void perf_evlist__delete(struct perf_evlist *evlist);
void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);
int perf_evlist__add_default(struct perf_evlist *evlist);
-void perf_evlist__id_hash(struct perf_evlist *evlist, struct perf_evsel *evsel,
- int cpu, int thread, u64 id);
+void perf_evlist__id_add(struct perf_evlist *evlist, struct perf_evsel *evsel,
+ int cpu, int thread, u64 id);
int perf_evlist__alloc_pollfd(struct perf_evlist *evlist);
void perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd);