perf evlist: Tolerate NULL maps in propagate_maps
authorJiri Olsa <[email protected]>
Tue, 21 Jul 2015 12:31:29 +0000 (14:31 +0200)
committerArnaldo Carvalho de Melo <[email protected]>
Tue, 21 Jul 2015 17:34:07 +0000 (14:34 -0300)
Tolerating NULL maps in perf_evlist__propagate_maps, so we dont need to
pass evlist with both cpus and threads maps defined.

Signed-off-by: Jiri Olsa <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
tools/perf/util/evlist.c

index 80ab942afa8ab03d0b8a43c0acf9580908f1d443..3b9f411a6b461272903e9b8559ada718d2e57867 100644 (file)
@@ -1119,7 +1119,8 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
 
                evsel->threads = thread_map__get(evlist->threads);
 
-               if (!evsel->cpus || !evsel->threads)
+               if ((evlist->cpus && !evsel->cpus) ||
+                   (evlist->threads && !evsel->threads))
                        return -ENOMEM;
        }