From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752596Ab3LKLIh (ORCPT ); Wed, 11 Dec 2013 06:08:37 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60376 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785Ab3LKLID (ORCPT ); Wed, 11 Dec 2013 06:08:03 -0500 Date: Wed, 11 Dec 2013 03:07:12 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, eranian@google.com, paulus@samba.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, efault@gmx.de, namhyung@kernel.org, jolsa@redhat.com, fweisbec@gmail.com, adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, acme@redhat.com, paulus@samba.org, eranian@google.com, linux-kernel@vger.kernel.org, efault@gmx.de, peterz@infradead.org, namhyung@kernel.org, jolsa@redhat.com, fweisbec@gmail.com, dsahern@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf machine: Don't open code assign dso-> short_name Git-Commit-ID: 7521ab592550d9e6542a496bcea11b40900690da 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 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.1 (terminus.zytor.com [127.0.0.1]); Wed, 11 Dec 2013 03:07:18 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7521ab592550d9e6542a496bcea11b40900690da Gitweb: http://git.kernel.org/tip/7521ab592550d9e6542a496bcea11b40900690da Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 10 Dec 2013 10:58:47 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 10 Dec 2013 16:51:08 -0300 perf machine: Don't open code assign dso->short_name Use dso__set_short_name instead, as it will release any previously, possibly allocated, short name. Cc: Adrian Hunter Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-1v39elw7v6nxczpntpp7ljwr@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 f66f309..f85da9a 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -935,7 +935,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, if (name == NULL) goto out_problem; - map->dso->short_name = name; + dso__set_short_name(map->dso, name); map->dso->short_name_allocated = 1; map->end = map->start + event->mmap.len; } else if (is_kernel_mmap) {