diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-07 16:24:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-07 16:24:57 +0100 |
| commit | 4d9218daae2b00379b2bb81eaf4fe5143f372db1 (patch) | |
| tree | 575efccf53ea7ced32e2896f8d2ed491e4673471 /tools/perf/builtin-lock.c | |
| parent | 8a4d0b56b031455adcbe4a9383c3b497456fcfac (diff) | |
| parent | 8ce000e83848578a621d64eccdc88bd34c2fc70c (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Fix version when building out of tree, as when using one of these:
$ make help | grep perf
perf-tar-src-pkg - Build perf-3.12.0.tar source tarball
perf-targz-src-pkg - Build perf-3.12.0.tar.gz source tarball
perf-tarbz2-src-pkg - Build perf-3.12.0.tar.bz2 source tarball
perf-tarxz-src-pkg - Build perf-3.12.0.tar.xz source tarball
$
from David Ahern.
* Don't relookup fields by name in each sample in 'trace',
by Arnaldo Carvalho de Melo.
* 'perf record' code cleanups, from David Ahern.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-lock.c')
| -rw-r--r-- | tools/perf/builtin-lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 35f9aaa565cc..c852c7a85d32 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -819,8 +819,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, return -1; } - if (evsel->handler.func != NULL) { - tracepoint_handler f = evsel->handler.func; + if (evsel->handler != NULL) { + tracepoint_handler f = evsel->handler; return f(evsel, sample); } |