diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/tests/code-reading.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/tests/code-reading.c')
-rw-r--r-- | tools/perf/tests/code-reading.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 85d4919..e3fedfa 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -275,19 +275,8 @@ static int process_event(struct machine *machine, struct perf_evlist *evlist, if (event->header.type == PERF_RECORD_SAMPLE) return process_sample_event(machine, evlist, event, state); - if (event->header.type == PERF_RECORD_THROTTLE || - event->header.type == PERF_RECORD_UNTHROTTLE) - return 0; - - if (event->header.type < PERF_RECORD_MAX) { - int ret; - - ret = machine__process_event(machine, event, NULL); - if (ret < 0) - pr_debug("machine__process_event failed, event type %u\n", - event->header.type); - return ret; - } + if (event->header.type < PERF_RECORD_MAX) + return machine__process_event(machine, event); return 0; } @@ -452,7 +441,7 @@ static int do_test_code_reading(bool try_kcore) } ret = perf_event__synthesize_thread_map(NULL, threads, - perf_event__process, machine, false); + perf_event__process, machine); if (ret < 0) { pr_debug("perf_event__synthesize_thread_map failed\n"); goto out_err; |