Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbbG2IL2 (ORCPT ); Wed, 29 Jul 2015 04:11:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56815 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753279AbbG2ILY (ORCPT ); Wed, 29 Jul 2015 04:11:24 -0400 Date: Wed, 29 Jul 2015 01:11:09 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, hpa@zytor.com, jolsa@kernel.org, dsahern@gmail.com, namhyung@kernel.org, tglx@linutronix.de, acme@redhat.com In-Reply-To: <1437481927-29538-10-git-send-email-jolsa@kernel.org> References: <1437481927-29538-10-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Tolerate NULL maps in propagate_maps Git-Commit-ID: 0e5ffb317d7f861c309b0ab679ed2f59e9f72adf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1586 Lines: 41 Commit-ID: 0e5ffb317d7f861c309b0ab679ed2f59e9f72adf Gitweb: http://git.kernel.org/tip/0e5ffb317d7f861c309b0ab679ed2f59e9f72adf Author: Jiri Olsa AuthorDate: Tue, 21 Jul 2015 14:31:29 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 21 Jul 2015 14:34:07 -0300 perf evlist: Tolerate NULL maps in propagate_maps Tolerating NULL maps in perf_evlist__propagate_maps, so we dont need to pass evlist with both cpus and threads maps defined. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1437481927-29538-10-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 80ab942..3b9f411 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/