diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-20 02:21:52 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-20 02:21:52 +0400 |
| commit | 6a396f67d2442e30150ffb5e1142dbb2f2181d3f (patch) | |
| tree | 2ea4f3ab1d3766204a55ec26600b848ed3a7e8aa /tools/perf/util/parse-events.h | |
| parent | f884dcaead5f17bf586ac5fe6a3ad07b5203616a (diff) | |
| parent | cccddf4f5580131c9b963900e1d3400655e633cc (diff) | |
| download | linux-6a396f67d2442e30150ffb5e1142dbb2f2181d3f.tar.xz | |
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
Conflicts:
fs/nfs/nfs4xdr.c
Diffstat (limited to 'tools/perf/util/parse-events.h')
| -rw-r--r-- | tools/perf/util/parse-events.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 1ea5d09b6eb1..192a962e3a0f 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -10,6 +10,7 @@ extern int nr_counters; extern struct perf_counter_attr attrs[MAX_COUNTERS]; extern char *event_name(int ctr); +extern char *__event_name(int type, u64 config); extern int parse_events(const struct option *opt, const char *str, int unset); |