diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-04 08:10:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 08:10:28 +0100 |
| commit | 928585536ff5a8f320e60efc60e2b7ef2a5f548d (patch) | |
| tree | 5b12281a00ec049e8c35f1fb2810e111b22c90c0 /tools/perf/util/trace-event.h | |
| parent | cc2221969906a166a638aecdbae84a3d0462719e (diff) | |
| parent | d854861c4292a4e675a5d3bfd862c5f7421c81e8 (diff) | |
Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/util/trace-event.h')
| -rw-r--r-- | tools/perf/util/trace-event.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index b3e86b1e4444..b5f12ca24d99 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -262,9 +262,8 @@ raw_field_value(struct event *event, const char *name, void *data); void *raw_field_ptr(struct event *event, const char *name, void *data); unsigned long long eval_flag(const char *flag); -int read_tracing_data(int fd, struct perf_event_attr *pattrs, int nb_events); -ssize_t read_tracing_data_size(int fd, struct perf_event_attr *pattrs, - int nb_events); +int read_tracing_data(int fd, struct list_head *pattrs); +ssize_t read_tracing_data_size(int fd, struct list_head *pattrs); /* taken from kernel/trace/trace.h */ enum trace_flag_type { |