diff options
author | 2013-09-04 11:25:44 -0600 | |
---|---|---|
committer | 2013-09-04 11:25:44 -0600 | |
commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
tree | 592283e59e121b76355836295d6016fe33cfc5d1 /tools/perf/util/trace-event-scripting.c | |
parent | vfio-pci: Test for extended config space (diff) | |
parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
download | wireguard-linux-3bc4f3993b93dbf1f6402e2034a2e20eb07db807.tar.xz wireguard-linux-3bc4f3993b93dbf1f6402e2034a2e20eb07db807.zip |
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, struct perf_sample *sample __maybe_unused, struct perf_evsel *evsel __maybe_unused, struct machine *machine __maybe_unused, - struct addr_location *al __maybe_unused) + struct thread *thread __maybe_unused, + struct addr_location *al __maybe_unused) { } |