From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbbIPHbN (ORCPT ); Wed, 16 Sep 2015 03:31:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39398 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751822AbbIPHbL (ORCPT ); Wed, 16 Sep 2015 03:31:11 -0400 Date: Wed, 16 Sep 2015 00:30:59 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: adrian.hunter@intel.com, jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com, kan.liang@intel.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, kan.liang@intel.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, adrian.hunter@intel.com In-Reply-To: <1441699142-18905-2-git-send-email-adrian.hunter@intel.com> References: <1441699142-18905-2-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Simplify propagate_maps() logic Git-Commit-ID: a69b09e2342a9c144b0291b9aeb849ab7d5843bf 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 Commit-ID: a69b09e2342a9c144b0291b9aeb849ab7d5843bf Gitweb: http://git.kernel.org/tip/a69b09e2342a9c144b0291b9aeb849ab7d5843bf Author: Adrian Hunter AuthorDate: Tue, 8 Sep 2015 10:58:49 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 15 Sep 2015 10:08:22 -0300 perf evlist: Simplify propagate_maps() logic If evsel->cpus is to be reassigned then the current value must be "put", which works even if it is NULL. Simplify the current logic by moving the "put" next to the assignment. Signed-off-by: Adrian Hunter Acked-by: Jiri Olsa Cc: Kan Liang Link: http://lkml.kernel.org/r/1441699142-18905-2-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index d51a520..95e07ea 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, * We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ - if (evsel->cpus && has_user_cpus) + if (!evsel->cpus || has_user_cpus) { cpu_map__put(evsel->cpus); - - if (!evsel->cpus || has_user_cpus) evsel->cpus = cpu_map__get(evlist->cpus); + } evsel->threads = thread_map__get(evlist->threads);