Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / tools / perf / tests / code-reading.c

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 49ccc3b2995ee30c8c2ad55a4c4b8308d9ad9055..85d4919dd62313e64ee508d08cb47b255c4ce0f0 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -275,8 +275,19 @@ 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_MAX)
-               return machine__process_event(machine, event, NULL);
+       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;
+       }
 
        return 0;
 }
@@ -441,7 +452,7 @@ static int do_test_code_reading(bool try_kcore)
        }
 
        ret = perf_event__synthesize_thread_map(NULL, threads,
-                                               perf_event__process, machine);
+                                               perf_event__process, machine, false);
        if (ret < 0) {
                pr_debug("perf_event__synthesize_thread_map failed\n");
                goto out_err;