From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70BD3C04A95 for ; Wed, 28 Sep 2022 06:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233236AbiI1Gmf (ORCPT ); Wed, 28 Sep 2022 02:42:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233262AbiI1Glz (ORCPT ); Wed, 28 Sep 2022 02:41:55 -0400 Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 550F6115F58; Tue, 27 Sep 2022 23:41:18 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-08.nifty.com with ESMTP id 28S6e0G6004120; Wed, 28 Sep 2022 15:40:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 28S6e0G6004120 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664347206; bh=YuiSaa5TunTalSUSMGyvPMuKWQEyEfJw4GcU2AlJPTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+Ss4BadPpG9mhokH76NFCXwNpyJQQk2U8LJ4BwzVCdlAJ5XNmrwWT8k75kv1tce4 nIw0Uo7jpa6ovFT2ARJiPPjYY7eVBw7fMJLiYxkfY37DTPqeXOHzW1fx+Vx22LmijS K7jlW/hi1z3ybhJ/Xkcw5kTMWrWdm69YtsgfLZliWrAuZrtmj5Fv6VXW8SL1ZcXgg/ bLFjtJJBwJQviSosJMYW4KgcT5SBuYiCVjR19kLRj4P/RelMJEpqSyhorZPrpPAy93 uJ48CCjueLhOp19nNgI+0Bnv7oqtxm6rgoir/M7SQKcsmK6PxHsgUGaNCeHkCs+y78 BYGyrmHRhgCUA== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, Al Viro , Ard Biesheuvel , Nicolas Pitre , Masahiro Yamada , Nick Desaulniers , Michal Marek Subject: [PATCH v3 5/8] modpost: squash sym_update_namespace() into sym_add_exported() Date: Wed, 28 Sep 2022 15:39:44 +0900 Message-Id: <20220928063947.299333-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220928063947.299333-1-masahiroy@kernel.org> References: <20220928063947.299333-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org Pass a set of the name, license, and namespace to sym_add_exported(). sym_update_namespace() is unneeded. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- (no changes since v1) scripts/mod/modpost.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 13fff6e92aef..0bb5bbd176b4 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -352,26 +352,8 @@ static const char *sec_name(const struct elf_info *info, unsigned int secindex) #define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0) -static void sym_update_namespace(const char *symname, const char *namespace) -{ - struct symbol *s = find_symbol(symname); - - /* - * That symbol should have been created earlier and thus this is - * actually an assertion. - */ - if (!s) { - error("Could not update namespace(%s) for symbol %s\n", - namespace, symname); - return; - } - - free(s->namespace); - s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL; -} - static struct symbol *sym_add_exported(const char *name, struct module *mod, - bool gpl_only) + bool gpl_only, const char *namespace) { struct symbol *s = find_symbol(name); @@ -384,6 +366,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, s = alloc_symbol(name); s->module = mod; s->is_gpl_only = gpl_only; + s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL; list_add_tail(&s->list, &mod->exported_symbols); hash_add_symbol(s); @@ -657,17 +640,12 @@ static void handle_symbol(struct module *mod, struct elf_info *info, break; default: if (sym->st_shndx == info->export_symbol_sec) { - const char *name; - - if (strstarts(symname, "__export_symbol_gpl.")) { - name = symname + strlen("__export_symbol_gpl."); - sym_add_exported(name, mod, true); - sym_update_namespace(name, sym_get_data(info, sym)); - } else if (strstarts(symname, "__export_symbol.")) { - name = symname + strlen("__export_symbol."); - sym_add_exported(name, mod, false); - sym_update_namespace(name, sym_get_data(info, sym)); - } + if (strstarts(symname, "__export_symbol_gpl.")) + sym_add_exported(symname + strlen("__export_symbol_gpl."), + mod, true, sym_get_data(info, sym)); + else if (strstarts(symname, "__export_symbol.")) + sym_add_exported(symname + strlen("__export_symbol."), + mod, false, sym_get_data(info, sym)); break; } @@ -2283,9 +2261,8 @@ static void read_dump(const char *fname) mod = new_module(modname, strlen(modname)); mod->from_dump = true; } - s = sym_add_exported(symname, mod, gpl_only); + s = sym_add_exported(symname, mod, gpl_only, namespace); sym_set_crc(s, crc); - sym_update_namespace(symname, namespace); } free(buf); return; -- 2.34.1