1 files changed, 11 insertions, 2 deletions

diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index a0717b93d8f5..fa935093a599 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -188,8 +188,17 @@ static struct cpu_map *cpu_map__from_entries(struct cpu_map_entries *cpus)
         if (map) {
                 unsigned i;
 
-                for (i = 0; i < cpus->nr; i++)
-                        map->map[i] = (int)cpus->cpu[i];
+                for (i = 0; i < cpus->nr; i++) {
+                        /*
+                         * Special treatment for -1, which is not real cpu number,
+                         * and we need to use (int) -1 to initialize map[i],
+                         * otherwise it would become 65535.
+                         */
+                        if (cpus->cpu[i] == (u16) -1)
+                                map->map[i] = -1;
+                        else
+                                map->map[i] = (int) cpus->cpu[i];
+                }
         }
 
         return map;