diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /tools/perf/util/trace-event.h | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'tools/perf/util/trace-event.h')
| -rw-r--r-- | tools/perf/util/trace-event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index b04da572243..f674dda3363 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h | |||
| @@ -280,6 +280,7 @@ struct scripting_ops { | |||
| 280 | int (*stop_script) (void); | 280 | int (*stop_script) (void); |
| 281 | void (*process_event) (union perf_event *event, | 281 | void (*process_event) (union perf_event *event, |
| 282 | struct perf_sample *sample, | 282 | struct perf_sample *sample, |
| 283 | struct perf_evsel *evsel, | ||
| 283 | struct perf_session *session, | 284 | struct perf_session *session, |
| 284 | struct thread *thread); | 285 | struct thread *thread); |
| 285 | int (*generate_script) (const char *outfile); | 286 | int (*generate_script) (const char *outfile); |