Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix segfault pressing -> in 'perf top' with no hist entries. (Wang Nan)

   E.g:
	perf top -e page-faults --pid 11400 # 11400 generates no page-fault

- Fix propagation of thread and cpu maps, that got broken when doing incomplete
  changes to better support events with a PMU cpu mask, leading to Intel PT to
  fail with an error like:

    $ perf record -e intel_pt//u uname
    Error: The sys_perf_event_open() syscall returned with
              22 (Invalid argument) for event (sched:sched_switch).

  Because intel_pt adds that sched:sched_switch evsel to the evlist after the
  thread/cpu maps were propagated to the evsels, fix it. (Adrian Hunter)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index d826e6f515db..21ed6ee63da9 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -287,8 +287,8 @@ __add_event(struct list_head *list, int *idx,
         if (!evsel)
                 return NULL;
 
-        if (cpus)
-                evsel->cpus = cpu_map__get(cpus);
+        evsel->cpus     = cpu_map__get(cpus);
+        evsel->own_cpus = cpu_map__get(cpus);
 
         if (name)
                 evsel->name = strdup(name);
@@ -1140,10 +1140,9 @@ int parse_events(struct perf_evlist *evlist, const char *str,
         ret = parse_events__scanner(str, &data, PE_START_EVENTS);
         perf_pmu__parse_cleanup();
         if (!ret) {
-                int entries = data.idx - evlist->nr_entries;
                 struct perf_evsel *last;
 
-                perf_evlist__splice_list_tail(evlist, &data.list, entries);
+                perf_evlist__splice_list_tail(evlist, &data.list);
                 evlist->nr_groups += data.nr_groups;
                 last = perf_evlist__last(evlist);
                 last->cmdline_group_boundary = true;