[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150721173123.GA16921@kernel.org>
Date: Tue, 21 Jul 2015 14:31:23 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Jiri Olsa <jolsa@...nel.org>
Cc: lkml <linux-kernel@...r.kernel.org>,
David Ahern <dsahern@...il.com>,
Ingo Molnar <mingo@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: Re: [PATCH 09/47] perf tools: Tolerate NULL maps in
perf_evlist__propagate_maps
Em Tue, Jul 21, 2015 at 02:31:29PM +0200, Jiri Olsa escreveu:
> Tolerating NULL maps in perf_evlist__propagate_maps,
> so we dont need to pass evlist with both cpus and threads
> maps defined.
Applied
> Link: http://lkml.kernel.org/n/tip-y15hjmv6uu8b6gyhkz5v41rw@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> ---
> tools/perf/util/evlist.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 63bc24dbf03b..f1714bedd5de 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -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;
> }
>
> --
> 2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists