diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /tools/perf/util/header.h | |
parent | sparc64: Initial niagara2 perf counter support. (diff) | |
parent | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
download | linux-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz linux-cabc5c0f7fa1342049042d6e147db5a73773955b.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'tools/perf/util/header.h')
-rw-r--r-- | tools/perf/util/header.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index bf280449fcfd..5d0a72ecc919 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -31,6 +31,10 @@ struct perf_header_attr * perf_header_attr__new(struct perf_counter_attr *attr); void perf_header_attr__add_id(struct perf_header_attr *self, u64 id); +u64 perf_header__sample_type(struct perf_header *header); +struct perf_counter_attr * +perf_header__find_attr(u64 id, struct perf_header *header); + struct perf_header *perf_header__new(void); |