Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757778Ab2HUQCv (ORCPT ); Tue, 21 Aug 2012 12:02:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60584 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666Ab2HUQCt (ORCPT ); Tue, 21 Aug 2012 12:02:49 -0400 Date: Tue, 21 Aug 2012 09:02:25 -0700 From: tip-bot for Cody P Schafer Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org, mingo@redhat.com, hpa@zytor.com, mingo@kernel.org, cody@linux.vnet.ibm.com, a.p.zijlstra@chello.nl, matthltc@us.ibm.com, dave@linux.vnet.ibm.com, namhyung@kernel.org, sukadev@linux.vnet.ibm.com, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, mingo@redhat.com, paulus@samba.org, linux-kernel@vger.kernel.org, acme@redhat.com, cody@linux.vnet.ibm.com, a.p.zijlstra@chello.nl, dave@linux.vnet.ibm.com, matthltc@us.ibm.com, namhyung@kernel.org, tglx@linutronix.de, sukadev@linux.vnet.ibm.com In-Reply-To: <1344637382-22789-8-git-send-email-cody@linux.vnet.ibm.com> References: <1344637382-22789-8-git-send-email-cody@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: Simplify out_fixup in kernel syms loading Git-Commit-ID: 0a0317b41e20770f81bc61d7b208957385466c3f 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.2.6 (terminus.zytor.com [127.0.0.1]); Tue, 21 Aug 2012 09:02:31 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1925 Lines: 50 Commit-ID: 0a0317b41e20770f81bc61d7b208957385466c3f Gitweb: http://git.kernel.org/tip/0a0317b41e20770f81bc61d7b208957385466c3f Author: Cody P Schafer AuthorDate: Fri, 10 Aug 2012 15:22:53 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 13 Aug 2012 14:22:32 -0300 perf symbols: Simplify out_fixup in kernel syms loading The only site that jumps to out_fixup has (kallsyms_filename == NULL). And all paths that reach 'if (err > 0)' without 'goto out_fixup' have kallsyms_filename != NULL. So skip over both the check & dso__set_long_name(), and remove the check. Signed-off-by: Cody P Schafer Cc: David Hansen Cc: Ingo Molnar Cc: Matt Hellsley Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Sukadev Bhattiprolu Link: http://lkml.kernel.org/r/1344637382-22789-8-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 2127002..e5c3817 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1503,9 +1503,8 @@ do_kallsyms: free(kallsyms_allocated_filename); if (err > 0) { + dso__set_long_name(dso, strdup("[kernel.kallsyms]")); out_fixup: - if (kallsyms_filename != NULL) - dso__set_long_name(dso, strdup("[kernel.kallsyms]")); map__fixup_start(map); map__fixup_end(map); } -- 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/