From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756244AbbJAHMn (ORCPT ); Thu, 1 Oct 2015 03:12:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44408 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756203AbbJAHMk (ORCPT ); Thu, 1 Oct 2015 03:12:40 -0400 Date: Thu, 1 Oct 2015 00:12:20 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: namhyung@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, hpa@zytor.com, adrian.hunter@intel.com, acme@redhat.com, jolsa@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: acme@redhat.com, adrian.hunter@intel.com, wangnan0@huawei.com, hpa@zytor.com, dsahern@gmail.com, jolsa@redhat.com, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib symbol: Rename kallsyms2elf_type to kallsyms2elf_binding Git-Commit-ID: 8e947f1e84fd1588f66e5f2ea69c80647de72cd4 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: 8e947f1e84fd1588f66e5f2ea69c80647de72cd4 Gitweb: http://git.kernel.org/tip/8e947f1e84fd1588f66e5f2ea69c80647de72cd4 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 30 Sep 2015 12:42:07 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 30 Sep 2015 18:34:30 -0300 tools lib symbol: Rename kallsyms2elf_type to kallsyms2elf_binding It is about binding, not type, we have just a letter in kallsyms that should map both for the ELF type (STT_FUNC, etc) and to the ELF symbol binding (STB_WEAK, STB_GLOBAL, etc), so rename it now before introducing kallsyms2_elf_type() Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-uu5vj343ms1q2wm55690on6v@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/symbol/kallsyms.h | 2 +- tools/perf/util/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/symbol/kallsyms.h b/tools/lib/symbol/kallsyms.h index 6084f5e..bb86c5b7 100644 --- a/tools/lib/symbol/kallsyms.h +++ b/tools/lib/symbol/kallsyms.h @@ -9,7 +9,7 @@ #define KSYM_NAME_LEN 256 #endif -static inline u8 kallsyms2elf_type(char type) +static inline u8 kallsyms2elf_binding(char type) { if (type == 'W') return STB_WEAK; diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 1f97ffb..bcda43b 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -624,7 +624,7 @@ static int map__process_kallsym_symbol(void *arg, const char *name, * symbols, setting length to 0, and rely on * symbols__fixup_end() to fix it up. */ - sym = symbol__new(start, 0, kallsyms2elf_type(type), name); + sym = symbol__new(start, 0, kallsyms2elf_binding(type), name); if (sym == NULL) return -ENOMEM; /*