From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752981AbbE0Qs6 (ORCPT ); Wed, 27 May 2015 12:48:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38956 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752154AbbE0Qsz (ORCPT ); Wed, 27 May 2015 12:48:55 -0400 Date: Wed, 27 May 2015 09:48:04 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, jolsa@redhat.com, adrian.hunter@intel.com, acme@redhat.com, eranian@google.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@kernel.org, dzickus@redhat.com, fweisbec@gmail.com, dsahern@gmail.com, namhyung@kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, dzickus@redhat.com, fweisbec@gmail.com, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com, adrian.hunter@intel.com, jolsa@redhat.com, acme@redhat.com, eranian@google.com, bp@suse.de, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf machine: Do not call map_groups__delete(), drop refcnt instead Git-Commit-ID: 8e160b2e1e3efdd84ddef726f9b5136dd192a682 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: 8e160b2e1e3efdd84ddef726f9b5136dd192a682 Gitweb: http://git.kernel.org/tip/8e160b2e1e3efdd84ddef726f9b5136dd192a682 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 19 May 2015 20:07:14 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 May 2015 12:21:44 -0300 perf machine: Do not call map_groups__delete(), drop refcnt instead It could be used somewhere, so just call map__groups_put() to make sure we don't delete it prematurely Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-dxmh8mr12i65p8h909vi88cp@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index daa5591..7ec3188 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -333,7 +333,7 @@ static void machine__update_thread_pid(struct machine *machine, if (!map_groups__empty(th->mg)) pr_err("Discarding thread maps for %d:%d\n", th->pid_, th->tid); - map_groups__delete(th->mg); + map_groups__put(th->mg); } th->mg = map_groups__get(leader->mg);