diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-16 18:35:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-16 18:35:21 -0700 |
| commit | 4643b05662966a615845803c7bc89c5a5e77d6d5 (patch) | |
| tree | 0ef389769c2b5f50f3ab34e6e53346b140817798 /tools/perf/util/session.c | |
| parent | cdd5983063cadf40db63117f4a299881b3bb71c1 (diff) | |
| parent | 6c7b8e82aab75a25581c4d446fc87f96634e9ef9 (diff) | |
| download | linux-hpc-4643b05662966a615845803c7bc89c5a5e77d6d5.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Handle failures of parsing immediate operands in the instruction decoder
perf archive: Correct cutting of symbolic link
perf tools: Ignore auto-generated bison/flex files
perf tools: Fix parsers' rules to dependencies
perf tools: fix NO_GTK2 Makefile config error
perf session: Skip event correctly for unknown id/machine
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 00923cda4d9c30..1efd3bee6336bd 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -876,11 +876,11 @@ static int perf_session_deliver_event(struct perf_session *session, dump_sample(session, event, sample); if (evsel == NULL) { ++session->hists.stats.nr_unknown_id; - return -1; + return 0; } if (machine == NULL) { ++session->hists.stats.nr_unprocessable_samples; - return -1; + return 0; } return tool->sample(tool, event, sample, evsel, machine); case PERF_RECORD_MMAP: |