From patchwork Sun May 14 15:27:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 93713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp6367874vqo; Sun, 14 May 2023 08:29:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5IYmX74UY8f8MoNZnVYWS8s+6HkJNmtfpbCRiJABhIZ1pMUivZGyge5I9o9TsLyZFCCmOQ X-Received: by 2002:a05:6a00:883:b0:63b:2320:a39f with SMTP id q3-20020a056a00088300b0063b2320a39fmr42335303pfj.19.1684078169964; Sun, 14 May 2023 08:29:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684078169; cv=none; d=google.com; s=arc-20160816; b=mkXvw2GAUA6n5vRiG86ooGOtmAXybnjJRtvq+ai9o1UmbIkVq5lUR0g8PudL6+C6lx EowBA6g/uPiqkHS6ZjdRlPdgZZhKsH7BstqB49eL+BPyuH2ec2LkfM8jYWHcwR714TfG eVeTm+KzXcmQlLAVI/8Lx2XuUza/caNDLW8n91UzRU6e3LYcfUbZ64zT6+tTY+6ptFAb e3mohMwdNyVuZZ3VIJNAbPZGTV2u4552he1grbEIJbDjRIKQvSYM1pj/QbauEgnJFkB1 EjWf/UfRQPDupDuLSryRaNT5POnhvIm27EX9qoPTrl2OkgDJ9g9fQ7+1DqDQVA8GV4mv vyOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7AeJQG2+o5seUVmKjCAEPTZ7Jd3esVKiz7rxLe2SheQ=; b=V9NTfBfiVaj3Be9cLPjlaKkXfmv3DHkXlSDK4cZb9qf47V+PzXCCWPUdPdLhd+XiCT fDVNk37wDvth03WryLCyRj0FJvJwEnJGNkOoKHzRKnm3k5L6FdiB84DLThwE04r2Vo3x NaWu12Aq77PQV45j9UMqSRsZX+DXm6AAX1GZgPzLomGyOO9QfBp0yf/goNzwxOgVKSqB 69kU8NjxHak2AetuvIf0foqfdtCrS19xfpbdQQbgt7eIC3MteKitZLgg6OU+t99hcItn YQ2JhN/S3tkxngR7y3ikifFYfBV6cLkPEX/qm9keFg0z8lJ61UNYLGVqCSERIGNvNv3y WTvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LWa5Wdc0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b123-20020a62cf81000000b00643b9afbb97si15142911pfg.56.2023.05.14.08.29.15; Sun, 14 May 2023 08:29:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LWa5Wdc0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237625AbjENP2B (ORCPT + 99 others); Sun, 14 May 2023 11:28:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237217AbjENP1z (ORCPT ); Sun, 14 May 2023 11:27:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09AB43C12; Sun, 14 May 2023 08:27:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9C4C860B77; Sun, 14 May 2023 15:27:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46CB9C433EF; Sun, 14 May 2023 15:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684078073; bh=EkENQxBTRXmNLefaXpEZoKKE9XDY5Mk/Sp9CRBIt9Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LWa5Wdc0qwBVcqQm63iNnH/Vh6IFxNT6WFGNs3FgSFoyByArb8b/CmX3VaWr74HqG MNr5I2ulp+sJbH+Xv19XLlQYjkzwlMzPmyqWCgpnUWvzhtWyGjIxURjr8Vp5TrFy3B QKm70u9KxG4SllTAcUsiDSKjS/hNQcabcZkuJQCPCYM29TRW52IodSWcgfAFDCmL1w lLIPn+DNF8cOb3ydb3AW4ru0oy9pzs7JZFn5c/xh9avqlk4D1u0Hb9NwTlWEXem6uS uMl80vZyJJTcnp2l0nYWBIWltmj+FlRHe2DvbDKaamanFKpqG3odp0JrZlVKgGRhlH m6YMLIwFKH7Qg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Pitre , Nicolas Schier , Masahiro Yamada Subject: [PATCH v5 03/21] modpost: remove get_prettyname() Date: Mon, 15 May 2023 00:27:21 +0900 Message-Id: <20230514152739.962109-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230514152739.962109-1-masahiroy@kernel.org> References: <20230514152739.962109-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765883950942796786?= X-GMAIL-MSGID: =?utf-8?q?1765883950942796786?= This is the last user of get_pretty_name() - it is just used to distinguish whether the symbol is a function or not. It is not valuable information. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index bbe066f7adbc..371891d67175 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1207,23 +1207,6 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, return near; } -static int is_function(Elf_Sym *sym) -{ - if (sym) - return ELF_ST_TYPE(sym->st_info) == STT_FUNC; - else - return -1; -} - -static inline void get_pretty_name(int is_func, const char** name, const char** name_p) -{ - switch (is_func) { - case 0: *name = "variable"; *name_p = ""; break; - case 1: *name = "function"; *name_p = "()"; break; - default: *name = "(unknown reference)"; *name_p = ""; break; - } -} - /* * Print a warning about a section mismatch. * Try to find symbols near it so user can find it. @@ -1299,15 +1282,9 @@ static void report_extable_warnings(const char* modname, struct elf_info* elf, { Elf_Sym* tosym = find_elf_symbol(elf, r->r_addend, sym); const char* tosym_name = sym_name(elf, tosym); - const char* to_pretty_name; - const char* to_pretty_name_p; - get_pretty_name(is_function(tosym), - &to_pretty_name, &to_pretty_name_p); - - warn("%s(%s+0x%lx): Section mismatch in reference to the %s %s:%s%s\n", - modname, fromsec, (long)r->r_offset, - to_pretty_name, tosec, tosym_name, to_pretty_name_p); + warn("%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n", + modname, fromsec, (long)r->r_offset, tosec, tosym_name); if (!match(tosec, mismatch->bad_tosec) && is_executable_section(elf, get_secindex(elf, sym)))