diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
| commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
| tree | 592283e59e121b76355836295d6016fe33cfc5d1 /tools/perf/util/trace-event-scripting.c | |
| parent | 17638db1b88184d8895f3f4551c936d7480a1d3f (diff) | |
| parent | cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (diff) | |
Merge remote branch 'origin/master' into next-merge
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
| -rw-r--r-- | tools/perf/util/trace-event-scripting.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c index 8715a1006d00..95199e4eea97 100644 --- a/tools/perf/util/trace-event-scripting.c +++ b/tools/perf/util/trace-event-scripting.c | |||
| @@ -39,7 +39,8 @@ static void process_event_unsupported(union perf_event *event __maybe_unused, | |||
| 39 | struct perf_sample *sample __maybe_unused, | 39 | struct perf_sample *sample __maybe_unused, |
| 40 | struct perf_evsel *evsel __maybe_unused, | 40 | struct perf_evsel *evsel __maybe_unused, |
| 41 | struct machine *machine __maybe_unused, | 41 | struct machine *machine __maybe_unused, |
| 42 | struct addr_location *al __maybe_unused) | 42 | struct thread *thread __maybe_unused, |
| 43 | struct addr_location *al __maybe_unused) | ||
| 43 | { | 44 | { |
| 44 | } | 45 | } |
| 45 | 46 | ||