From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933431AbbGURba (ORCPT ); Tue, 21 Jul 2015 13:31:30 -0400 Received: from mail.kernel.org ([198.145.29.136]:37271 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755042AbbGURb2 (ORCPT ); Tue, 21 Jul 2015 13:31:28 -0400 Date: Tue, 21 Jul 2015 14:31:23 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra Subject: Re: [PATCH 09/47] perf tools: Tolerate NULL maps in perf_evlist__propagate_maps Message-ID: <20150721173123.GA16921@kernel.org> References: <1437481927-29538-1-git-send-email-jolsa@kernel.org> <1437481927-29538-10-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437481927-29538-10-git-send-email-jolsa@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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