Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / tools / perf / util / parse-events.c

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 2a4d1ec028464757d6723bbd08c2d0ce0a010a14..09f8d23571082ef6698f37eefcd8f9d9815f1fdc 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -17,6 +17,7 @@
 #include "parse-events-flex.h"
 #include "pmu.h"
 #include "thread_map.h"
+#include "cpumap.h"
 #include "asm/bug.h"
 
 #define MAX_NAME_LEN 100
@@ -285,7 +286,9 @@ __add_event(struct list_head *list, int *idx,
        if (!evsel)
                return NULL;
 
-       evsel->cpus = cpus;
+       if (cpus)
+               evsel->cpus = cpu_map__get(cpus);
+
        if (name)
                evsel->name = strdup(name);
        list_add_tail(&evsel->node, list);