1 files changed, 4 insertions, 6 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 183b199b0d09..1201daf71719 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -609,12 +609,10 @@ int perf_evlist__create_maps(struct perf_evlist *evlist,
         if (evlist->threads == NULL)
                 return -1;
 
-        if (target->uid != UINT_MAX || target->tid)
-                evlist->cpus = cpu_map__dummy_new();
-        else if (!target->system_wide && target->cpu_list == NULL)
-                evlist->cpus = cpu_map__dummy_new();
-        else
+        if (!perf_target__no_cpu(target))
                 evlist->cpus = cpu_map__new(target->cpu_list);
+        else
+                evlist->cpus = cpu_map__dummy_new();
 
         if (evlist->cpus == NULL)
                 goto out_delete_threads;
@@ -831,7 +829,7 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,
                 exit(-1);
         }
 
-        if (!opts->target.system_wide && !opts->target.tid && !opts->target.pid)
+        if (perf_target__none(&opts->target))
                 evlist->threads->map[0] = evlist->workload.pid;
 
         close(child_ready_pipe[1]);