From patchwork Wed May 9 07:23:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135206 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309397lji; Wed, 9 May 2018 00:25:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo6Y9qsuWrD+UvLLk3LC4ksx4D3Z2MNjKrrID5Ae3EKx3a7KE6FwRhJ2ewItC4cYmJKvCLx X-Received: by 2002:a63:6fc8:: with SMTP id k191-v6mr35094990pgc.330.1525850735595; Wed, 09 May 2018 00:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850735; cv=none; d=google.com; s=arc-20160816; b=jUzhYud2yzb6FqDPmSBWO7eSrAPL8x8K19IwanEXZNLWv552vYoINdBiF5pD5neGY5 gHC9/ahu6rtFSyB603zR19JXNDDmajPLgdRcepbauOMnnteZmzaHsHSPW8BYstvrwjwg T0lcEtbnm/scBRasHmvpnBSc46hGISPh59k4SxlXMgkRg/QOw00bOdeMsFf2POkqOhX7 GJeljmRMkEr60Q14Pww9FCnkDS1u+sP2xGl1o4B9kkmGlfp/4o9uBOHj0FaheECQbD8Z V+KKR2lzId+xNWbwozinKHw0L6oMucsRgAzEiZnjc6y18/77Ec8uOEvgktLrOfk0SSKl KVdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=LSg+NhNBxIuxf4HCWPbHsIcLNCNwXBF+p2zvctk59vQ=; b=0Wy1IS1/X9ml1mxIzbdfdqS6J1UcQf1tSsqf/pbLAWhoic0nIchQpbydoFU0VLa0O3 xevsY/TekyButH8KIkZnAEyZgICA1mK+dko7d45H5n1IKTd+nydTOlQnjkcL+Wv616qi OdSTXgT85CmkFsv3sXEwVDJIv8pYeO5G2QmelvAbS3fHfojdlDOb4DRrhEdJ5BQGzJ6H j8OPopN6bT9+FDG33YjW3AVtUx/whGXf7UE7YF47nmDpZFI56STE/6ZnvFJSrbIjyokw gtlCgY1QQYsk7H/kIYNQcQYcmlMPBKuFSgPwdCEg6mWA5T0AhQKx+Ue6eAtCWJ/OHLTH Cu8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=q+BHlexP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t9-v6si24616296plo.592.2018.05.09.00.25.35; Wed, 09 May 2018 00:25:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=q+BHlexP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756241AbeEIHY4 (ORCPT + 29 others); Wed, 9 May 2018 03:24:56 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50745 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756211AbeEIHYu (ORCPT ); Wed, 9 May 2018 03:24:50 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36D028852; Wed, 9 May 2018 16:24:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36D028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850645; bh=LSg+NhNBxIuxf4HCWPbHsIcLNCNwXBF+p2zvctk59vQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q+BHlexPUtLgFr53WXn+g5kbTKUiTXL6xIkSflpudYKU3j5FJimHuVDl0eu6R9WV5 3iyDRqxbhXldLcDJjML1g9l0V/A3tFNQDJFUPcSNFjk2lUNUrPuIJH0mgQ6bI92mZ5 1VV37j5rnc9rWW68pb1SM9a7ClhLnTOjVrW+/IxyK22bwHYqzbG/zTlAsX5ehr0rWO Q3tp6fNhASvA280zOxB0SrWW0irWwhU7VQ584/fENlBsvvpAHNbvuW8T3fBDXMietA +uAX18JXTlZCP1eXfj9q9xQbHyWh3tsZqi2tOYdlwxMfDfZ/1Chvi0nNoQfZqwQFjt bmZFayscrvy9Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 1/8] modpost: remove symbol prefix support Date: Wed, 9 May 2018 16:23:45 +0900 Message-Id: <1525850632-10921-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence VMLINUX_SYMBOL_STR(foo) can be simplify replaced with "foo". Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 4ff08a0..bc71925 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -19,9 +19,7 @@ #include #include #include "modpost.h" -#include "../../include/generated/autoconf.h" #include "../../include/linux/license.h" -#include "../../include/linux/export.h" /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; @@ -591,7 +589,7 @@ static void parse_elf_finish(struct elf_info *info) static int ignore_undef_symbol(struct elf_info *info, const char *symname) { /* ignore __this_module, it will be resolved shortly */ - if (strcmp(symname, VMLINUX_SYMBOL_STR(__this_module)) == 0) + if (strcmp(symname, "__this_module") == 0) return 1; /* ignore global offset table */ if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0) @@ -617,9 +615,6 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname) return 0; } -#define CRC_PFX VMLINUX_SYMBOL_STR(__crc_) -#define KSYMTAB_PFX VMLINUX_SYMBOL_STR(__ksymtab_) - static void handle_modversions(struct module *mod, struct elf_info *info, Elf_Sym *sym, const char *symname) { @@ -634,7 +629,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info, export = export_from_sec(info, get_secindex(info, sym)); /* CRC'd symbol */ - if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) { + if (strncmp(symname, "__crc_", strlen("__crc_")) == 0) { is_crc = true; crc = (unsigned int) sym->st_value; if (sym->st_shndx != SHN_UNDEF && sym->st_shndx != SHN_ABS) { @@ -647,7 +642,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info, info->sechdrs[sym->st_shndx].sh_addr : 0); crc = *crcp; } - sym_update_crc(symname + strlen(CRC_PFX), mod, crc, + sym_update_crc(symname + strlen("__crc_"), mod, crc, export); } @@ -685,15 +680,10 @@ static void handle_modversions(struct module *mod, struct elf_info *info, } #endif -#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX - if (symname[0] != '_') - break; - else - symname++; -#endif if (is_crc) { const char *e = is_vmlinux(mod->name) ?"":".ko"; - warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n", symname + strlen(CRC_PFX), mod->name, e); + warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n", + symname + strlen("__crc_"), mod->name, e); } mod->unres = alloc_symbol(symname, ELF_ST_BIND(sym->st_info) == STB_WEAK, @@ -701,13 +691,13 @@ static void handle_modversions(struct module *mod, struct elf_info *info, break; default: /* All exported symbols */ - if (strncmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) { - sym_add_exported(symname + strlen(KSYMTAB_PFX), mod, + if (strncmp(symname, "__ksymtab_", strlen("__ksymtab_")) == 0) { + sym_add_exported(symname + strlen("__ksymtab_"), mod, export); } - if (strcmp(symname, VMLINUX_SYMBOL_STR(init_module)) == 0) + if (strcmp(symname, "init_module") == 0) mod->has_init = 1; - if (strcmp(symname, VMLINUX_SYMBOL_STR(cleanup_module)) == 0) + if (strcmp(symname, "cleanup_module") == 0) mod->has_cleanup = 1; break; } @@ -2230,7 +2220,7 @@ static int add_versions(struct buffer *b, struct module *mod) err = 1; break; } - buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n", + buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name); } From patchwork Wed May 9 07:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135205 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309277lji; Wed, 9 May 2018 00:25:26 -0700 (PDT) X-Google-Smtp-Source: AB8JxZot7AzcYjOownpP6e2ZgcCTBsn9ivIPZM8CaG+wFKoy8Ydo7IXqAxbg1Ye/W6IASvMHMFkQ X-Received: by 2002:a65:62d9:: with SMTP id m25-v6mr18081250pgv.407.1525850726294; Wed, 09 May 2018 00:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850726; cv=none; d=google.com; s=arc-20160816; b=xp6daoIQQh8jATlDyDxTW8SEGOAcWXti3vUoJ69cvgAvSd46aG7W3QeunOoctGVHfg 4mTaNXoJCytrosoqjIsKB4zGQD16OABOiUQ+umfSmBdn7m4mHXjROWw7VE+AduxeKEbB EV42AwoZ0op/Xzh98eFeX1Ha5LesS8B3TYvfWRqCyS3HsfHEO8qCMi1LL5fM7OL+DpB4 nYMLJ+kQRKFN3C1q3Q850/cPrhW46nYz1GA88kVRLWIGzsIkYbGdpP55w7j6s/O2sq6H 435qSnqdSo1hg0DDpxvf6VFHrNPuDgkgxknD12BbSu7BeDBaOIs9bAumZy+WuweMqeIl iL9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=tkCsT8ZAS1PenYR9aUkCCuaCl2IOD4BtKtz/e3afaS0=; b=MzcUu4MalUqvGrW1wwgJwie/WClmrrsem1EhV/UhjFVeQwMdt4HSEnyGXvANuAA6YZ sF6t5bH1YyZIcvxIqWZq/HrV28+iEyYFoxRmLIkeFDnxfassQ0AlWrRGjb6/Ui3Rg4/g 8MvPutHAZjDnj1cIr3tWsFuAsAy34TBurpVM2S7LLsO+sFwLKvH99rgqJiloYD9DmRri 6d5xmislGF1GPwtDF0WkVkVzg1++992O/JtqB+C634piWvsUnvK7GI5lTgV9ssE1J2X3 74doyT2j6+7BPDoWDLErFpqSjcHZibf9OudzqjtVXe20yBNzMr1U3m0SdoHw23G1xY4i nXpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=c2S4/Nd5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t9-v6si24616296plo.592.2018.05.09.00.25.26; Wed, 09 May 2018 00:25:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=c2S4/Nd5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933741AbeEIHY6 (ORCPT + 29 others); Wed, 9 May 2018 03:24:58 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50743 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400AbeEIHYu (ORCPT ); Wed, 9 May 2018 03:24:50 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36E028852; Wed, 9 May 2018 16:24:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36E028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850645; bh=tkCsT8ZAS1PenYR9aUkCCuaCl2IOD4BtKtz/e3afaS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2S4/Nd5YybivMuFwjc6SXfj96SRvzScwxc+tZUndfRv5M8eqhhQVjR1j6wMVQRZH IxY4OD8lVu/+bvN6JP2QDf0q+dowWR8iaQsL4joA3MfvrzGpIyLR1wl8FhHu/pN2Tr mNGDGAhT9R+5fMOqsD/FRPnImUlFfM6lnspTHa7EX4rbDYLjAXsGYzrmqXXNw3ccPy D4cIYRfD7D3b2xUosSDat+BrC1J1J5L55fQENnuWjytEqi23bCz1vqUdWyXQwtDQP3 IE+gCLKgLoZSfiIrOWnDC31K+RVLgdONcVi7X88NyjOYChMNBJ0UZkwFhStM7fzBsk B0+LAh9EAqBVw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/8] genksyms: remove symbol prefix support Date: Wed, 9 May 2018 16:23:46 +0900 Message-Id: <1525850632-10921-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the -s (--symbol-prefix) option is unnecessary. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 2 -- scripts/genksyms/genksyms.c | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 8bdb1dc..22df8d0 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -147,7 +147,6 @@ $(obj)/%.i: $(src)/%.c FORCE cmd_gensymtypes_c = \ $(CPP) -D__GENKSYMS__ $(c_flags) $< | \ $(GENKSYMS) $(if $(1), -T $(2)) \ - $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \ $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \ $(if $(KBUILD_PRESERVE),-p) \ -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null)) @@ -355,7 +354,6 @@ cmd_gensymtypes_S = \ sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \ $(CPP) -D__GENKSYMS__ $(c_flags) -xc - | \ $(GENKSYMS) $(if $(1), -T $(2)) \ - $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \ $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \ $(if $(KBUILD_PRESERVE),-p) \ -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null)) diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index c9235d8..e007840 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -45,7 +45,6 @@ int in_source_file; static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types, flag_preserve, flag_warnings, flag_rel_crcs; -static const char *mod_prefix = ""; static int errors; static int nsyms; @@ -693,10 +692,10 @@ void export_symbol(const char *name) fputs(">\n", debugfile); /* Used as a linker script. */ - printf(!flag_rel_crcs ? "%s__crc_%s = 0x%08lx;\n" : + printf(!flag_rel_crcs ? "__crc_%s = 0x%08lx;\n" : "SECTIONS { .rodata : ALIGN(4) { " - "%s__crc_%s = .; LONG(0x%08lx); } }\n", - mod_prefix, name, crc); + "__crc_%s = .; LONG(0x%08lx); } }\n", + name, crc); } } @@ -769,7 +768,6 @@ int main(int argc, char **argv) #ifdef __GNU_LIBRARY__ struct option long_opts[] = { - {"symbol-prefix", 1, 0, 's'}, {"debug", 0, 0, 'd'}, {"warnings", 0, 0, 'w'}, {"quiet", 0, 0, 'q'}, @@ -789,9 +787,6 @@ int main(int argc, char **argv) while ((o = getopt(argc, argv, "s:dwqVDr:T:phR")) != EOF) #endif /* __GNU_LIBRARY__ */ switch (o) { - case 's': - mod_prefix = optarg; - break; case 'd': flag_debug++; break; From patchwork Wed May 9 07:23:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135202 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5308817lji; Wed, 9 May 2018 00:24:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqcNafH/NgTQe8Eqh5K/cDDlJcaDrmZB7B1hLn302HlrHPvnhI30ze2Rp0gn2MIugH1TPsB X-Received: by 2002:a63:ba4b:: with SMTP id l11-v6mr425499pgu.453.1525850691940; Wed, 09 May 2018 00:24:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850691; cv=none; d=google.com; s=arc-20160816; b=xVVMX9LyDt33xZD0McuBsFjtDviSOLCqgi3gKhOt14WeOYBneVU9h74kInJsOIEDLL S0fPWCPrJeWY7l3d3ihU7uOq6jzAjCtUM2LhhT0pQ6nLGrJuCp9r2do2yYOq5vxH2i60 mgpJZcE25MRx1qbDhySC5fLULZkMNMMlb+NE+0afwgM3m2ruQVZaDvVnZhpZE/nhjMx1 zMzx4dZv7PCXGc4cjeVjV9dfmdSHjj5BnDnMPvsl+/38gEce/MA5HTjHHZ8vXk2CJ+D/ 10dUZjfTHZ3QScqFj7EDESk5XL53Zl+mWyHKO/K+mTA79qaHs1sJ0ojzR3AXaoAM9l5f fNsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=o/d5Z+2WhigJjiqFxVGEeQWtFIWa+tJN0ZTWxN/8OG0=; b=rrBFCc19k5hnX6PHhzeVKSLQ3eSGxC/86uidAzmC9i5crQtQZGkQfTKzJNU4IVzzg0 IagX5GZfq312cBxZwsH3vZARAiSme84wNMQxbHipdPuYC7nV9Q2QGX+LZ3sbZ1dQeHe7 Mi3T+9CUSG1yDL7rm4ONHo5AA+Uy3bBFcacGCVNXZCemqW1jCXL82oAIsN6XnCncj7b5 +4sqfxGIP4vXbD6Pkv2LloEuWnU2+nbXMOW5xoA0qlrIeGb/NRz2MzOxmQTv0AVzCkiH guvvlyrXIw/TVgCpLSKzbttr+cVFPIk9b676GObNwMl7BmR7IUoYMYL8jGYZGwrL5lHd S48g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=yvAyeMtR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d15-v6si25614897plj.186.2018.05.09.00.24.51; Wed, 09 May 2018 00:24:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=yvAyeMtR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756210AbeEIHYt (ORCPT + 29 others); Wed, 9 May 2018 03:24:49 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50567 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400AbeEIHYq (ORCPT ); Wed, 9 May 2018 03:24:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36F028852; Wed, 9 May 2018 16:24:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36F028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850646; bh=o/d5Z+2WhigJjiqFxVGEeQWtFIWa+tJN0ZTWxN/8OG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yvAyeMtR/BTkOWf6GQX9mXE1v6GrznvF+eO/C3qqnkF2Wg6MLdoMTEZon+TtK8+bO tE3L1Kwhh3xaQ9CMF9nPZr/2MRJIOhnUupfTt9E72zlmA2O7wYXbKms7cWcJk3bpe3 CVobDVj+569wkGr7YhzGbKIDg+W5HbAHCHBN4CZfbQ8CAodrOB4DHsDlXNlw/qXbze AIynlZbKqpzrJoOYfFV3HqtkaspUSOvH/ogS6GxRoTG3tbi2bdCsXx+srGrF5cUBZM ZCUNhqlIS+rEqNxxbZti38I8qPBUCR007gW/CD7EWWn5t1dBhuKJMtJCuK2Po0CjKo SC7YJEuI5S7ww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/8] kallsyms: remove symbol prefix support Date: Wed, 9 May 2018 16:23:47 +0900 Message-Id: <1525850632-10921-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the --symbol-prefix option is unnecessary. Signed-off-by: Masahiro Yamada --- scripts/kallsyms.c | 47 +++++++++++------------------------------------ scripts/link-vmlinux.sh | 4 ---- 2 files changed, 11 insertions(+), 40 deletions(-) -- 2.7.4 diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 5abfbf1..8041762 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -62,7 +62,6 @@ static struct sym_entry *table; static unsigned int table_size, table_cnt; static int all_symbols = 0; static int absolute_percpu = 0; -static char symbol_prefix_char = '\0'; static int base_relative = 0; int token_profit[0x10000]; @@ -75,7 +74,6 @@ unsigned char best_table_len[256]; static void usage(void) { fprintf(stderr, "Usage: kallsyms [--all-symbols] " - "[--symbol-prefix=] " "[--base-relative] < in.map > out.S\n"); exit(1); } @@ -113,28 +111,22 @@ static int check_symbol_range(const char *sym, unsigned long long addr, static int read_symbol(FILE *in, struct sym_entry *s) { - char str[500]; - char *sym, stype; + char sym[500], stype; int rc; - rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); + rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, sym); if (rc != 3) { - if (rc != EOF && fgets(str, 500, in) == NULL) + if (rc != EOF && fgets(sym, 500, in) == NULL) fprintf(stderr, "Read error or end of file.\n"); return -1; } - if (strlen(str) > KSYM_NAME_LEN) { + if (strlen(sym) > KSYM_NAME_LEN) { fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", - str, strlen(str), KSYM_NAME_LEN); + sym, strlen(sym), KSYM_NAME_LEN); return -1; } - sym = str; - /* skip prefix char */ - if (symbol_prefix_char && str[0] == symbol_prefix_char) - sym++; - /* Ignore most absolute/undefined (?) symbols. */ if (strcmp(sym, "_text") == 0) _text = s->addr; @@ -155,7 +147,7 @@ static int read_symbol(FILE *in, struct sym_entry *s) is_arm_mapping_symbol(sym)) return -1; /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */ - else if (str[0] == '$') + else if (sym[0] == '$') return -1; /* exclude debugging symbols */ else if (stype == 'N' || stype == 'n') @@ -163,14 +155,14 @@ static int read_symbol(FILE *in, struct sym_entry *s) /* include the type field in the symbol name, so that it gets * compressed together */ - s->len = strlen(str) + 1; + s->len = strlen(sym) + 1; s->sym = malloc(s->len + 1); if (!s->sym) { fprintf(stderr, "kallsyms failure: " "unable to allocate required amount of memory\n"); exit(EXIT_FAILURE); } - strcpy((char *)s->sym + 1, str); + strcpy((char *)s->sym + 1, sym); s->sym[0] = stype; s->percpu_absolute = 0; @@ -233,11 +225,6 @@ static int symbol_valid(struct sym_entry *s) int i; char *sym_name = (char *)s->sym + 1; - /* skip prefix char */ - if (symbol_prefix_char && *sym_name == symbol_prefix_char) - sym_name++; - - /* if --all-symbols is not specified, then symbols outside the text * and inittext sections are discarded */ if (!all_symbols) { @@ -302,15 +289,9 @@ static void read_map(FILE *in) static void output_label(char *label) { - if (symbol_prefix_char) - printf(".globl %c%s\n", symbol_prefix_char, label); - else - printf(".globl %s\n", label); + printf(".globl %s\n", label); printf("\tALGN\n"); - if (symbol_prefix_char) - printf("%c%s:\n", symbol_prefix_char, label); - else - printf("%s:\n", label); + printf("%s:\n", label); } /* uncompress a compressed symbol. When this function is called, the best table @@ -768,13 +749,7 @@ int main(int argc, char **argv) all_symbols = 1; else if (strcmp(argv[i], "--absolute-percpu") == 0) absolute_percpu = 1; - else if (strncmp(argv[i], "--symbol-prefix=", 16) == 0) { - char *p = &argv[i][16]; - /* skip quote */ - if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\'')) - p++; - symbol_prefix_char = *p; - } else if (strcmp(argv[i], "--base-relative") == 0) + else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; else usage(); diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 9045823..4bf811c 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -121,10 +121,6 @@ kallsyms() info KSYM ${2} local kallsymopt; - if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then - kallsymopt="${kallsymopt} --symbol-prefix=_" - fi - if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then kallsymopt="${kallsymopt} --all-symbols" fi From patchwork Wed May 9 07:23:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135208 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309792lji; Wed, 9 May 2018 00:26:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoaZrtIhMBiWUn36e7vqylc8Qoe3TI7MIJD7FRMy1AZvkmuuoX8oKp55QhlURh+LbJMTR0G X-Received: by 2002:a65:64d0:: with SMTP id t16-v6mr17666739pgv.9.1525850766839; Wed, 09 May 2018 00:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850766; cv=none; d=google.com; s=arc-20160816; b=LDShpcnUN7tbuv9x/0QnfGwy42HW1/DgGYkoJzQbh9hXwN+hy4ZMSKFnSZR1QUv0Om Gf6ahUMxUIU/enaqjIsoPemMzIKevK3TmVH4HycZFvaLlSGbZcMWiGNO1MavG6wXNj9b n/5xldyYZWS/kTxvZPVWS7dOo06Kx36KlZAxntdkFYMjODMqRLEyqUvqrWngLBgpb+Yw IPsU77lB8ebyFdSydbskka9DTjiUAFbvmaD73p2le1MbWmC0zqOBHLsYPlkt760M364G ff+HycsHnujxwWzm66g5x5+eyK5vDyO3q0E+TqWJccYeAlGeqcqDAjFOKfCJpTB48r6O TT6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=NELkMiFmO1gHCrH3vhHu9mDakdpUlm6U7Gv2PhE7ssA=; b=zmyqZitzL+cVRvCUONwxRZCNi5gDyinNlrQssznpSQDRCpeKBg3VNZjmpBzDyCEXdT CnU7JYme04p7qH8Ge6f5VlL+ZwhHa0yFgGhdj0b1pfd6nEHIqTFLZt9wkVax0D3Qj1V9 vs6b/duSuvN438LM0BVqrycTH/NibhSUf1ie57MsdB0M+ztQL+dgeSbBR/NRBz8XTmk4 mBZpfJB2w4kEAhDQWBq/qp6XzSDYdciOdJBh6x1XFy4fHKydbUs9UtD6r0tQFgAvb6Pf QnGQy1KPm3CTkQf5QX/iZdqlOcnRO/HttgaaA3UXq+unlyCxhqjUBHvTIQatbRcRrlDE awRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uJQGMMz1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i33-v6si17645871pld.546.2018.05.09.00.26.06; Wed, 09 May 2018 00:26:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uJQGMMz1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756138AbeEIHYs (ORCPT + 29 others); Wed, 9 May 2018 03:24:48 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50568 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbeEIHYq (ORCPT ); Wed, 9 May 2018 03:24:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36G028852; Wed, 9 May 2018 16:24:06 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36G028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850646; bh=NELkMiFmO1gHCrH3vhHu9mDakdpUlm6U7Gv2PhE7ssA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uJQGMMz1cXw1fdKGskdZLUIDV793UDrz6i3hfJKY6weVvyqtEcw0UZt9kP6A6dY0U eGLDdBfptCce7Jt61K0QUSTDdcK0/9j67j7bp8uxVzUwrs81CDQZmT4ugmtaUBJncc y7rHLsjRE5toYkErkVbFM/OO151fMimVVM8mMWQDnHZB1UX4MqZXAi3PJiRMsXmJ5U sRjyiYbBed3RTdjHN0MxJdBvPMUdbVD3BO6iSFlGNaYV7+EHU4J0KnhZW+BRshL+BH DZsoRNVwyZJpS+e8XA6/qSZ/2a9gGZVxKgoovoHLHWd70zGKcBbstTpL15pYyDn88C dhfSZkOXfMc/A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] depmod.sh: remove symbol prefix support Date: Wed, 9 May 2018 16:23:48 +0900 Message-Id: <1525850632-10921-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the last argument of scripts/depmod.sh can be removed. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/depmod.sh | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 4cb8531..52ea534 100644 --- a/Makefile +++ b/Makefile @@ -1760,7 +1760,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) # Run depmod only if we have System.map and depmod is executable quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ - $(KERNELRELEASE) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))" + $(KERNELRELEASE) # Create temporary dir for module support files # clean it up only when building all modules diff --git a/scripts/depmod.sh b/scripts/depmod.sh index 9831cca..421d1aa 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -9,30 +9,11 @@ if test $# -ne 3; then fi DEPMOD=$1 KERNELRELEASE=$2 -SYMBOL_PREFIX=$3 if ! test -r System.map -a -x "$DEPMOD"; then exit 0 fi -# older versions of depmod don't support -P -# support was added in module-init-tools 3.13 -if test -n "$SYMBOL_PREFIX"; then - release=$("$DEPMOD" --version) - package=$(echo "$release" | cut -d' ' -f 1) - if test "$package" = "module-init-tools"; then - version=$(echo "$release" | cut -d' ' -f 2) - later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1) - if test "$later" != "$version"; then - # module-init-tools < 3.13, drop the symbol prefix - SYMBOL_PREFIX="" - fi - fi - if test -n "$SYMBOL_PREFIX"; then - SYMBOL_PREFIX="-P $SYMBOL_PREFIX" - fi -fi - # older versions of depmod require the version string to start with three # numbers, so we cheat with a symlink here depmod_hack_needed=true @@ -55,7 +36,7 @@ set -- -ae -F System.map if test -n "$INSTALL_MOD_PATH"; then set -- "$@" -b "$INSTALL_MOD_PATH" fi -"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX +"$DEPMOD" "$@" "$KERNELRELEASE" ret=$? if $depmod_hack_needed; then From patchwork Wed May 9 07:23:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135210 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5310082lji; Wed, 9 May 2018 00:26:31 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpqha+uTwzwf4Yls7ST1h7I+3pLmNfFMIBvn73fdmVUtCOqR/NVdMKAxHL7/xjvI8VlgfOy X-Received: by 2002:a17:902:b591:: with SMTP id a17-v6mr43914614pls.211.1525850791439; Wed, 09 May 2018 00:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850791; cv=none; d=google.com; s=arc-20160816; b=TmjDlbWUPw5Zm1wl0RtIwZ2aPy0fc96fbnuuWEd6Iv9VPRzPxc1Nt4S+TNjswSPdvM wsJDn67qlsXS5LXlU62vaNKuKCXrfWDwT05IquDi8n7AMIlYU/0lRylrvH9ATpXkMd8U XARIqb1y54Qc+qzNva/40Tyi3fmN1k925ZW0HcvbRNcF7+v10+xnpakA4YILOZu1kMqZ 20mCK/cd9U3WfhLpbNgycv08/e64wMKQ6HBMEC/WnOQOdgafooutdQ8j3tQDM/xP79ea A9L+nSBliYAuOhhb9KS0VSveU/8Jm8Mx+Y0sxywQ8pgsBGZxrb1hBLDaI3ZDlFrYLLiL L93Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=xhS00ZSM7KT+0n3/rX5mEiwCZNlVlih+SV5plVyaxAA=; b=F4jhPBJjJxxO88FAc6iunPa/07XX6isN3Zp5QPLnI0lUHRNug2QvvCGgkmpqRSjYH2 Lv4mBEVk0xYrQ6k5CcaUxPZF/DUxxjmrDeZf6j6bmjV+Bun5CSXoWubJKHPmN9BSV8oA h8dxtyWTPQv8gl+UTniOYY6XCeVHZOj5Ssm9v1FhdrcmTFJW+uSLxeIYu5QolDSAdq+K uNFEMmFg8KV0a6swJV/K9/7+S/N0K0qX/8YOpLPwcMhUk2RwId1jIraPrPkhCjO3UNzL GEm3EQTriGcXHCM+EjBEr70Rkhk0b+eIrvEsAT63rz4ZSNbJ313Dk3GPgzQyRCGTQi47 27EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LvgeEmg6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u36-v6si21466446pgn.213.2018.05.09.00.26.31; Wed, 09 May 2018 00:26:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LvgeEmg6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933794AbeEIH0Q (ORCPT + 29 others); Wed, 9 May 2018 03:26:16 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50566 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753339AbeEIHYq (ORCPT ); Wed, 9 May 2018 03:24:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36H028852; Wed, 9 May 2018 16:24:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36H028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850647; bh=xhS00ZSM7KT+0n3/rX5mEiwCZNlVlih+SV5plVyaxAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LvgeEmg6R3XmZTBMvycEe3JkwZI8xIlKjXf42BiTTab4QDvnvFt25R0IoXXPRbUzn VnKwxGMCQV+9TBJimKM6JlZuMVHOkg5tt9GTf1p909sgBZ0YkpKFRMhLHmA7TwfvvF JloFGMaEiI3n1Dl9Ic7V4dmPAe7lA/DmPPLPWYzkOnhdWCO5PHfNyBbpdrZrlTBXk0 1Jl96D19T9MSRL7ZR4ye+MCmgALhYcCiJiFfUO6pRt33ulr53wbPORrsZGqk6+6zu/ DmIvPt0F/NN1+qXAjJhuJ1N+mFqrK2uVm99A2dDWP1rKLSn/MpnmGSKAGUmdlDQSuy 9hIu0spcLpF/A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] export.h: remove code for prefixing symbols with underscore Date: Wed, 9 May 2018 16:23:49 +0900 Message-Id: <1525850632-10921-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX. Clean up the export.h headers. I am keeping VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR() because they are widely used. Signed-off-by: Masahiro Yamada --- include/asm-generic/export.h | 34 ++++++++++++---------------------- include/linux/export.h | 16 +++++----------- 2 files changed, 17 insertions(+), 33 deletions(-) -- 2.7.4 diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h index 719db19..68efb95 100644 --- a/include/asm-generic/export.h +++ b/include/asm-generic/export.h @@ -19,42 +19,32 @@ #define KCRC_ALIGN 4 #endif -#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX -#define KSYM(name) _##name -#else -#define KSYM(name) name -#endif - /* * note on .section use: @progbits vs %progbits nastiness doesn't matter, * since we immediately emit into those sections anyway. */ .macro ___EXPORT_SYMBOL name,val,sec #ifdef CONFIG_MODULES - .globl KSYM(__ksymtab_\name) + .globl __ksymtab_\name .section ___ksymtab\sec+\name,"a" .balign KSYM_ALIGN -KSYM(__ksymtab_\name): - __put \val, KSYM(__kstrtab_\name) +__ksymtab_\name: + __put \val, __kstrtab_\name .previous .section __ksymtab_strings,"a" -KSYM(__kstrtab_\name): -#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX - .asciz "_\name" -#else +__kstrtab_\name: .asciz "\name" -#endif .previous #ifdef CONFIG_MODVERSIONS .section ___kcrctab\sec+\name,"a" .balign KCRC_ALIGN -KSYM(__kcrctab_\name): +__kcrctab_\name: #if defined(CONFIG_MODULE_REL_CRCS) - .long KSYM(__crc_\name) - . + .long __crc_\name - . #else - .long KSYM(__crc_\name) + .long __crc_\name #endif - .weak KSYM(__crc_\name) + .weak __crc_\name .previous #endif #endif @@ -84,12 +74,12 @@ KSYM(__kcrctab_\name): #endif #define EXPORT_SYMBOL(name) \ - __EXPORT_SYMBOL(name, KSYM_FUNC(KSYM(name)),) + __EXPORT_SYMBOL(name, KSYM_FUNC(name),) #define EXPORT_SYMBOL_GPL(name) \ - __EXPORT_SYMBOL(name, KSYM_FUNC(KSYM(name)), _gpl) + __EXPORT_SYMBOL(name, KSYM_FUNC(name), _gpl) #define EXPORT_DATA_SYMBOL(name) \ - __EXPORT_SYMBOL(name, KSYM(name),) + __EXPORT_SYMBOL(name, name,) #define EXPORT_DATA_SYMBOL_GPL(name) \ - __EXPORT_SYMBOL(name, KSYM(name),_gpl) + __EXPORT_SYMBOL(name, name,_gpl) #endif diff --git a/include/linux/export.h b/include/linux/export.h index 1a1dfdb..b768d6d 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -10,14 +10,8 @@ * hackers place grumpy comments in header files. */ -/* Some toolchains use a `_' prefix for all user symbols. */ -#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX -#define __VMLINUX_SYMBOL(x) _##x -#define __VMLINUX_SYMBOL_STR(x) "_" #x -#else #define __VMLINUX_SYMBOL(x) x #define __VMLINUX_SYMBOL_STR(x) #x -#endif /* Indirect, so macros are expanded before pasting. */ #define VMLINUX_SYMBOL(x) __VMLINUX_SYMBOL(x) @@ -46,14 +40,14 @@ extern struct module __this_module; #if defined(CONFIG_MODULE_REL_CRCS) #define __CRC_SYMBOL(sym, sec) \ asm(" .section \"___kcrctab" sec "+" #sym "\", \"a\" \n" \ - " .weak " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ - " .long " VMLINUX_SYMBOL_STR(__crc_##sym) " - . \n" \ + " .weak __crc_" #sym " \n" \ + " .long __crc_" #sym " - . \n" \ " .previous \n"); #else #define __CRC_SYMBOL(sym, sec) \ asm(" .section \"___kcrctab" sec "+" #sym "\", \"a\" \n" \ - " .weak " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ - " .long " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ + " .weak __crc_" #sym " \n" \ + " .long __crc_" #sym " \n" \ " .previous \n"); #endif #else @@ -66,7 +60,7 @@ extern struct module __this_module; __CRC_SYMBOL(sym, sec) \ static const char __kstrtab_##sym[] \ __attribute__((section("__ksymtab_strings"), aligned(1))) \ - = VMLINUX_SYMBOL_STR(sym); \ + = #sym; \ static const struct kernel_symbol __ksymtab_##sym \ __used \ __attribute__((section("___ksymtab" sec "+" #sym), used)) \ From patchwork Wed May 9 07:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135207 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309578lji; Wed, 9 May 2018 00:25:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqC5aASBv4sZNWhGWjAIiw/+szbB3ejyG1Fln46wZagSWS2eYI4Se6XDCsuQbCJ++jFriQk X-Received: by 2002:a17:902:4c88:: with SMTP id b8-v6mr33318349ple.285.1525850750334; Wed, 09 May 2018 00:25:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850750; cv=none; d=google.com; s=arc-20160816; b=Q4IDVonzhLNvmFwVAHkYt+J6XtxDGZdey2avAVcM7FFds6wUrRHNNoQfUEfFDkTrDP JMvhLqZJBTd25+XB+leKRc2yqXkR+v/bMAfBwM7SvAZyTIGEX1r0bjtW5NJyYPMmw3WD ZPbRcOcJK2eoHlD2l/9oIiQJQJZ1d9zRWJoB3U6EdXox1ShDIlu2mP1jgRfLhHaXnPvs jRCYEG7mowcJk0yjq4a2dfwvSyqVa+CAny2KSzOJ//miNgGislkBWHyWENqb/UeiuB4K 5ok5jqdS+QzTUAyugmIesVSRU2S2/HPgXyFAxGZqgjVSXcVB58wQgC7O0ISfXns6ob0a OcSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=7DkgxglIpp/KA1uyzrCf8o8QxNMOg5dsU3AB4XzhcyI=; b=Ek8WoN5hb9TbAFgd4fxRiWSoCz798UjrQCQDobM1/LSCmhEKfLprarwhwrK1tlefng B/JqBsxdUZ4JXg+8FUSdQh4ftN4/v8JQkYB3wJgGUW/4PM7TqLAXVaTr5D+DRTtv4GCa kbAqUBlhCH1JtdJMjme8ro9VcvIjUVisV6RBJtaL6i/8ekyhrGn/jNxs4OrMbi+7RrIm SNUftyB+lLDkPoizIwuDrcnRj5K8JSMlJL9ZgqleUnLavmAowMzMjMnkD14UFdX0+TkS AGQI7VU35B9tJEf7eWnusrFSGFPLCbgMOTdxFxpFu1oKoH8PV4lqbFv+SLq8GIgULMC3 gkxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PelyxVt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h7-v6si13005995pgc.14.2018.05.09.00.25.50; Wed, 09 May 2018 00:25:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PelyxVt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756321AbeEIHZr (ORCPT + 29 others); Wed, 9 May 2018 03:25:47 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50858 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756217AbeEIHYy (ORCPT ); Wed, 9 May 2018 03:24:54 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36I028852; Wed, 9 May 2018 16:24:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36I028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850648; bh=7DkgxglIpp/KA1uyzrCf8o8QxNMOg5dsU3AB4XzhcyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PelyxVt3zU0yfFWZGyUBarPPxxoVkqR+u3CQUGJknAXo8t+w059k6UYpQOdY0N8Ud 2MMOltcAX3ZcgHQB+yNG/uyOakMmF49v+sMWAZyQ1eTuZTvNuvEOHOzzOJxK9k26oS YXLK2CQEmX/Po5OXsJTEdwI5/3355ro7q5EEck4raNFGLCW2vmZ77UFSQgG/3zDdfE 4SBQKtMPpzV5nfSUWVfTrHb79MJV1flDoM5vBHSI4RxD91lZThJ74E3fEMKZPpBvs3 qXCZlL5s8TkDJd+7Z/cXPiwOsdEA/h6dywRZKIGpBms4NvfkjxZXrCEVjdoNjzVt/p 1xxNbNcix797g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 6/8] kbuild: remove CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX Date: Wed, 9 May 2018 16:23:50 +0900 Message-Id: <1525850632-10921-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX. Clean up the rest of scripts, and remove the Kconfig entry. Signed-off-by: Masahiro Yamada --- arch/Kconfig | 6 ------ scripts/Makefile.build | 7 +------ scripts/adjust_autoksyms.sh | 3 --- 3 files changed, 1 insertion(+), 15 deletions(-) -- 2.7.4 diff --git a/arch/Kconfig b/arch/Kconfig index 3234b73..c88fa0e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -671,12 +671,6 @@ config MODULES_USE_ELF_REL Modules only use ELF REL relocations. Modules with ELF RELA relocations will give an error. -config HAVE_UNDERSCORE_SYMBOL_PREFIX - bool - help - Some architectures generate an _ in front of C symbols; things like - module loading and assembly files need to know about this. - config HAVE_IRQ_EXIT_ON_IRQ_STACK bool help diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 22df8d0..753b9ad 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -485,15 +485,10 @@ targets += $(lib-target) dummy-object = $(obj)/.lib_exports.o ksyms-lds = $(dot-target).lds -ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX -ref_prefix = EXTERN(_ -else -ref_prefix = EXTERN( -endif quiet_cmd_export_list = EXPORTS $@ cmd_export_list = $(OBJDUMP) -h $< | \ - sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/$(ref_prefix)\1)/p' >$(ksyms-lds);\ + sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/EXTERN(\1)/p' >$(ksyms-lds);\ rm -f $(dummy-object);\ echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\ $(LD) $(ld_flags) -r -o $@ -T $(ksyms-lds) $(dummy-object);\ diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 016b3c4..6e6d639 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -61,9 +61,6 @@ for mod in "$MODVERDIR"/*.mod; do sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod" done | sort -u | while read sym; do - if [ -n "$CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX" ]; then - sym="${sym#_}" - fi echo "#define __KSYM_${sym} 1" done >> "$new_ksyms_file" From patchwork Wed May 9 07:23:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135204 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309034lji; Wed, 9 May 2018 00:25:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo/0dwxc0VNso8kydrDwlndAgWboAmTg86QCZM2Du8fuyXSF8jpDBbY4yHy0U0qgEnTg3bV X-Received: by 10.98.82.129 with SMTP id g123mr20293842pfb.22.1525850708119; Wed, 09 May 2018 00:25:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850708; cv=none; d=google.com; s=arc-20160816; b=DnMzJcSv9Pc0HNAvAFHp1pV8PwYOLot9CKDBJnIkXPvulJiBk+IRdSx9ONlUDuACfU CKdFMNXdbLkMVKw5TDJPd20KHdfRs7piUYC3gRgbc8eSynFLgdunQpgQJWVFiTb+UeWE R878pBmktpYsbXrh0R2xcWnwmi79WSwLLnIvefAWZLjvY9k/2itBU4pwzaobqw9boma+ QwfygVW0lafVFK2ABII7K0ztGvnRSKVpdt2ryS6xC2g+YsZbtoDKWzM9k5UawNBdG0si lWk8Wl0/jA3Oli2IXMcDs1UDohQN4eJCMIbYqlNE2l2t+BhFox7OcUcYWucES5Z4x0ly j5rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=xAxtc31rqMGKPPFRwp0YFxHL0HX3roDBm8UE55OlozU=; b=QALURF7LNwnmNRM8igFdpVoqr48uzI4gc63RU64yMOuXyx2Q+K/AjYuT7eGVPpcoVo 3JBtWpLW/AXIpWBR1q5nU/sLih+nbOpS9QA+jO+EDDZBTqeZbQyWT73fUo+4Be+N8igf AoxVKLvESobh3bEmL6aKtTRCNasT8flCeoRR5TbLbEFbq9Ty7j3IftTrTb0WwlHPVsY6 zmOQkpRcuSzTefs7y63o4MfTnTjDHXE3/i8Bp/eJC7+tCY3zXijqKSTZg0DOqkrDly6+ /8pb52czt6CvfbdGgrx5ls6uxYal7ogB24MyCCtLoCE58wesI50ujKJDA9kbdO3UojlP DPZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BhMpcRVF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f28-v6si27519186plj.255.2018.05.09.00.25.07; Wed, 09 May 2018 00:25:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BhMpcRVF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756264AbeEIHZE (ORCPT + 29 others); Wed, 9 May 2018 03:25:04 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:51028 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933766AbeEIHZA (ORCPT ); Wed, 9 May 2018 03:25:00 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36J028852; Wed, 9 May 2018 16:24:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36J028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850648; bh=xAxtc31rqMGKPPFRwp0YFxHL0HX3roDBm8UE55OlozU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BhMpcRVF5qStWIO0zj1EEgmc4Od9bp/+mvB1vHxO1HOf7Sbwel1mNjthA8On3pbWz mbOVh07Rmsr36WsxhVUK/DqMDJMTNrSduP30dX7gINiGfzl3Uxcyh+WyUw4pmmLfN8 rs921fcGRbI8n6eDdguPe2RGv+R/yJHM2vzTNAS9t9djdyz2GPo8VLowo2Lk8pYCRQ LwpOXk6/MTNTGEm0Eo6fotnWCuurmtKuevsDdqQ3RxAOsa0gi/F3//2oOItRnBnY19 /Xzjrmdw3qsxmzlbGxgNt1Bd8PWhTsAsmgjd+j2MV1sTmxjyR/a+w/UjBIJpx1Nee+ jQspZS7szBxbQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] vmlinux.lds.h: remove no-op macro VMLINUX_SYMBOL() Date: Wed, 9 May 2018 16:23:51 +0900 Message-Id: <1525850632-10921-8-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that VMLINUX_SYMBOL() is no-op, clean up the linker script. Signed-off-by: Masahiro Yamada --- include/asm-generic/vmlinux.lds.h | 289 +++++++++++++++++++------------------- 1 file changed, 144 insertions(+), 145 deletions(-) -- 2.7.4 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 9efb82a..e373e2e 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -113,66 +113,66 @@ #ifdef CONFIG_FTRACE_MCOUNT_RECORD #define MCOUNT_REC() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_mcount_loc) = .; \ + __start_mcount_loc = .; \ KEEP(*(__mcount_loc)) \ - VMLINUX_SYMBOL(__stop_mcount_loc) = .; + __stop_mcount_loc = .; #else #define MCOUNT_REC() #endif #ifdef CONFIG_TRACE_BRANCH_PROFILING -#define LIKELY_PROFILE() VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \ - KEEP(*(_ftrace_annotated_branch)) \ - VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .; +#define LIKELY_PROFILE() __start_annotated_branch_profile = .; \ + KEEP(*(_ftrace_annotated_branch)) \ + __stop_annotated_branch_profile = .; #else #define LIKELY_PROFILE() #endif #ifdef CONFIG_PROFILE_ALL_BRANCHES -#define BRANCH_PROFILE() VMLINUX_SYMBOL(__start_branch_profile) = .; \ - KEEP(*(_ftrace_branch)) \ - VMLINUX_SYMBOL(__stop_branch_profile) = .; +#define BRANCH_PROFILE() __start_branch_profile = .; \ + KEEP(*(_ftrace_branch)) \ + __stop_branch_profile = .; #else #define BRANCH_PROFILE() #endif #ifdef CONFIG_KPROBES #define KPROBE_BLACKLIST() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \ + __start_kprobe_blacklist = .; \ KEEP(*(_kprobe_blacklist)) \ - VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .; + __stop_kprobe_blacklist = .; #else #define KPROBE_BLACKLIST() #endif #ifdef CONFIG_FUNCTION_ERROR_INJECTION #define ERROR_INJECT_WHITELIST() STRUCT_ALIGN(); \ - VMLINUX_SYMBOL(__start_error_injection_whitelist) = .;\ + __start_error_injection_whitelist = .; \ KEEP(*(_error_injection_whitelist)) \ - VMLINUX_SYMBOL(__stop_error_injection_whitelist) = .; + __stop_error_injection_whitelist = .; #else #define ERROR_INJECT_WHITELIST() #endif #ifdef CONFIG_EVENT_TRACING #define FTRACE_EVENTS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_ftrace_events) = .; \ + __start_ftrace_events = .; \ KEEP(*(_ftrace_events)) \ - VMLINUX_SYMBOL(__stop_ftrace_events) = .; \ - VMLINUX_SYMBOL(__start_ftrace_eval_maps) = .; \ + __stop_ftrace_events = .; \ + __start_ftrace_eval_maps = .; \ KEEP(*(_ftrace_eval_map)) \ - VMLINUX_SYMBOL(__stop_ftrace_eval_maps) = .; + __stop_ftrace_eval_maps = .; #else #define FTRACE_EVENTS() #endif #ifdef CONFIG_TRACING -#define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .; \ +#define TRACE_PRINTKS() __start___trace_bprintk_fmt = .; \ KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \ - VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .; -#define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .; \ + __stop___trace_bprintk_fmt = .; +#define TRACEPOINT_STR() __start___tracepoint_str = .; \ KEEP(*(__tracepoint_str)) /* Trace_printk fmt' pointer */ \ - VMLINUX_SYMBOL(__stop___tracepoint_str) = .; + __stop___tracepoint_str = .; #else #define TRACE_PRINTKS() #define TRACEPOINT_STR() @@ -180,27 +180,27 @@ #ifdef CONFIG_FTRACE_SYSCALLS #define TRACE_SYSCALLS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \ + __start_syscalls_metadata = .; \ KEEP(*(__syscalls_metadata)) \ - VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; + __stop_syscalls_metadata = .; #else #define TRACE_SYSCALLS() #endif #ifdef CONFIG_BPF_EVENTS #define BPF_RAW_TP() STRUCT_ALIGN(); \ - VMLINUX_SYMBOL(__start__bpf_raw_tp) = .; \ + __start__bpf_raw_tp = .; \ KEEP(*(__bpf_raw_tp_map)) \ - VMLINUX_SYMBOL(__stop__bpf_raw_tp) = .; + __stop__bpf_raw_tp = .; #else #define BPF_RAW_TP() #endif #ifdef CONFIG_SERIAL_EARLYCON #define EARLYCON_TABLE() . = ALIGN(8); \ - VMLINUX_SYMBOL(__earlycon_table) = .; \ + __earlycon_table = .; \ KEEP(*(__earlycon_table)) \ - VMLINUX_SYMBOL(__earlycon_table_end) = .; + __earlycon_table_end = .; #else #define EARLYCON_TABLE() #endif @@ -211,7 +211,7 @@ #define _OF_TABLE_0(name) #define _OF_TABLE_1(name) \ . = ALIGN(8); \ - VMLINUX_SYMBOL(__##name##_of_table) = .; \ + __##name##_of_table = .; \ KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table_end)) @@ -226,18 +226,18 @@ #ifdef CONFIG_ACPI #define ACPI_PROBE_TABLE(name) \ . = ALIGN(8); \ - VMLINUX_SYMBOL(__##name##_acpi_probe_table) = .; \ + __##name##_acpi_probe_table = .; \ KEEP(*(__##name##_acpi_probe_table)) \ - VMLINUX_SYMBOL(__##name##_acpi_probe_table_end) = .; + __##name##_acpi_probe_table_end = .; #else #define ACPI_PROBE_TABLE(name) #endif #define KERNEL_DTB() \ STRUCT_ALIGN(); \ - VMLINUX_SYMBOL(__dtb_start) = .; \ + __dtb_start = .; \ KEEP(*(.dtb.init.rodata)) \ - VMLINUX_SYMBOL(__dtb_end) = .; + __dtb_end = .; /* * .data section @@ -250,20 +250,20 @@ MEM_KEEP(init.data*) \ MEM_KEEP(exit.data*) \ *(.data.unlikely) \ - VMLINUX_SYMBOL(__start_once) = .; \ + __start_once = .; \ *(.data.once) \ - VMLINUX_SYMBOL(__end_once) = .; \ + __end_once = .; \ STRUCT_ALIGN(); \ *(__tracepoints) \ /* implement dynamic printk debug */ \ . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___jump_table) = .; \ + __start___jump_table = .; \ KEEP(*(__jump_table)) \ - VMLINUX_SYMBOL(__stop___jump_table) = .; \ + __stop___jump_table = .; \ . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___verbose) = .; \ + __start___verbose = .; \ KEEP(*(__verbose)) \ - VMLINUX_SYMBOL(__stop___verbose) = .; \ + __stop___verbose = .; \ LIKELY_PROFILE() \ BRANCH_PROFILE() \ TRACE_PRINTKS() \ @@ -275,10 +275,10 @@ */ #define NOSAVE_DATA \ . = ALIGN(PAGE_SIZE); \ - VMLINUX_SYMBOL(__nosave_begin) = .; \ + __nosave_begin = .; \ *(.data..nosave) \ . = ALIGN(PAGE_SIZE); \ - VMLINUX_SYMBOL(__nosave_end) = .; + __nosave_end = .; #define PAGE_ALIGNED_DATA(page_align) \ . = ALIGN(page_align); \ @@ -295,13 +295,13 @@ #define INIT_TASK_DATA(align) \ . = ALIGN(align); \ - VMLINUX_SYMBOL(__start_init_task) = .; \ - VMLINUX_SYMBOL(init_thread_union) = .; \ - VMLINUX_SYMBOL(init_stack) = .; \ + __start_init_task = .; \ + init_thread_union = .; \ + init_stack = .; \ KEEP(*(.data..init_task)) \ KEEP(*(.data..init_thread_info)) \ - . = VMLINUX_SYMBOL(__start_init_task) + THREAD_SIZE; \ - VMLINUX_SYMBOL(__end_init_task) = .; + . = __start_init_task + THREAD_SIZE; \ + __end_init_task = .; /* * Allow architectures to handle ro_after_init data on their @@ -309,9 +309,9 @@ */ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ - VMLINUX_SYMBOL(__start_ro_after_init) = .; \ + __start_ro_after_init = .; \ *(.data..ro_after_init) \ - VMLINUX_SYMBOL(__end_ro_after_init) = .; + __end_ro_after_init = .; #endif /* @@ -320,14 +320,14 @@ #define RO_DATA_SECTION(align) \ . = ALIGN((align)); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_rodata) = .; \ + __start_rodata = .; \ *(.rodata) *(.rodata.*) \ RO_AFTER_INIT_DATA /* Read only after init */ \ KEEP(*(__vermagic)) /* Kernel version magic */ \ . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ + __start___tracepoints_ptrs = .; \ KEEP(*(__tracepoints_ptrs)) /* Tracepoints: pointer array */ \ - VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \ + __stop___tracepoints_ptrs = .; \ *(__tracepoints_strings)/* Tracepoints: strings */ \ } \ \ @@ -337,109 +337,109 @@ \ /* PCI quirks */ \ .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \ + __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ - VMLINUX_SYMBOL(__end_pci_fixups_early) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_header) = .; \ + __end_pci_fixups_early = .; \ + __start_pci_fixups_header = .; \ KEEP(*(.pci_fixup_header)) \ - VMLINUX_SYMBOL(__end_pci_fixups_header) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_final) = .; \ + __end_pci_fixups_header = .; \ + __start_pci_fixups_final = .; \ KEEP(*(.pci_fixup_final)) \ - VMLINUX_SYMBOL(__end_pci_fixups_final) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_enable) = .; \ + __end_pci_fixups_final = .; \ + __start_pci_fixups_enable = .; \ KEEP(*(.pci_fixup_enable)) \ - VMLINUX_SYMBOL(__end_pci_fixups_enable) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_resume) = .; \ + __end_pci_fixups_enable = .; \ + __start_pci_fixups_resume = .; \ KEEP(*(.pci_fixup_resume)) \ - VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .; \ + __end_pci_fixups_resume = .; \ + __start_pci_fixups_resume_early = .; \ KEEP(*(.pci_fixup_resume_early)) \ - VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \ + __end_pci_fixups_resume_early = .; \ + __start_pci_fixups_suspend = .; \ KEEP(*(.pci_fixup_suspend)) \ - VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .; \ + __end_pci_fixups_suspend = .; \ + __start_pci_fixups_suspend_late = .; \ KEEP(*(.pci_fixup_suspend_late)) \ - VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \ + __end_pci_fixups_suspend_late = .; \ } \ \ /* Built-in firmware blobs */ \ .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_builtin_fw) = .; \ + __start_builtin_fw = .; \ KEEP(*(.builtin_fw)) \ - VMLINUX_SYMBOL(__end_builtin_fw) = .; \ + __end_builtin_fw = .; \ } \ \ TRACEDATA \ \ /* Kernel symbol table: Normal symbols */ \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab) = .; \ + __start___ksymtab = .; \ KEEP(*(SORT(___ksymtab+*))) \ - VMLINUX_SYMBOL(__stop___ksymtab) = .; \ + __stop___ksymtab = .; \ } \ \ /* Kernel symbol table: GPL-only symbols */ \ __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab_gpl) = .; \ + __start___ksymtab_gpl = .; \ KEEP(*(SORT(___ksymtab_gpl+*))) \ - VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \ + __stop___ksymtab_gpl = .; \ } \ \ /* Kernel symbol table: Normal unused symbols */ \ __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \ + __start___ksymtab_unused = .; \ KEEP(*(SORT(___ksymtab_unused+*))) \ - VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \ + __stop___ksymtab_unused = .; \ } \ \ /* Kernel symbol table: GPL-only unused symbols */ \ __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \ + __start___ksymtab_unused_gpl = .; \ KEEP(*(SORT(___ksymtab_unused_gpl+*))) \ - VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \ + __stop___ksymtab_unused_gpl = .; \ } \ \ /* Kernel symbol table: GPL-future-only symbols */ \ __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \ + __start___ksymtab_gpl_future = .; \ KEEP(*(SORT(___ksymtab_gpl_future+*))) \ - VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ + __stop___ksymtab_gpl_future = .; \ } \ \ /* Kernel symbol table: Normal symbols */ \ __kcrctab : AT(ADDR(__kcrctab) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___kcrctab) = .; \ + __start___kcrctab = .; \ KEEP(*(SORT(___kcrctab+*))) \ - VMLINUX_SYMBOL(__stop___kcrctab) = .; \ + __stop___kcrctab = .; \ } \ \ /* Kernel symbol table: GPL-only symbols */ \ __kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___kcrctab_gpl) = .; \ + __start___kcrctab_gpl = .; \ KEEP(*(SORT(___kcrctab_gpl+*))) \ - VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .; \ + __stop___kcrctab_gpl = .; \ } \ \ /* Kernel symbol table: Normal unused symbols */ \ __kcrctab_unused : AT(ADDR(__kcrctab_unused) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___kcrctab_unused) = .; \ + __start___kcrctab_unused = .; \ KEEP(*(SORT(___kcrctab_unused+*))) \ - VMLINUX_SYMBOL(__stop___kcrctab_unused) = .; \ + __stop___kcrctab_unused = .; \ } \ \ /* Kernel symbol table: GPL-only unused symbols */ \ __kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .; \ + __start___kcrctab_unused_gpl = .; \ KEEP(*(SORT(___kcrctab_unused_gpl+*))) \ - VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .; \ + __stop___kcrctab_unused_gpl = .; \ } \ \ /* Kernel symbol table: GPL-future-only symbols */ \ __kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .; \ + __start___kcrctab_gpl_future = .; \ KEEP(*(SORT(___kcrctab_gpl_future+*))) \ - VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .; \ + __stop___kcrctab_gpl_future = .; \ } \ \ /* Kernel symbol table: strings */ \ @@ -456,18 +456,18 @@ \ /* Built-in module parameters. */ \ __param : AT(ADDR(__param) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___param) = .; \ + __start___param = .; \ KEEP(*(__param)) \ - VMLINUX_SYMBOL(__stop___param) = .; \ + __stop___param = .; \ } \ \ /* Built-in module versions. */ \ __modver : AT(ADDR(__modver) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___modver) = .; \ + __start___modver = .; \ KEEP(*(__modver)) \ - VMLINUX_SYMBOL(__stop___modver) = .; \ + __stop___modver = .; \ . = ALIGN((align)); \ - VMLINUX_SYMBOL(__end_rodata) = .; \ + __end_rodata = .; \ } \ . = ALIGN((align)); @@ -478,9 +478,9 @@ #define SECURITY_INIT \ .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__security_initcall_start) = .; \ + __security_initcall_start = .; \ KEEP(*(.security_initcall.init)) \ - VMLINUX_SYMBOL(__security_initcall_end) = .; \ + __security_initcall_end = .; \ } /* @@ -504,47 +504,47 @@ * address even at second ld pass when generating System.map */ #define SCHED_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__sched_text_start) = .; \ + __sched_text_start = .; \ *(.sched.text) \ - VMLINUX_SYMBOL(__sched_text_end) = .; + __sched_text_end = .; /* spinlock.text is aling to function alignment to secure we have same * address even at second ld pass when generating System.map */ #define LOCK_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__lock_text_start) = .; \ + __lock_text_start = .; \ *(.spinlock.text) \ - VMLINUX_SYMBOL(__lock_text_end) = .; + __lock_text_end = .; #define CPUIDLE_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__cpuidle_text_start) = .; \ + __cpuidle_text_start = .; \ *(.cpuidle.text) \ - VMLINUX_SYMBOL(__cpuidle_text_end) = .; + __cpuidle_text_end = .; #define KPROBES_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__kprobes_text_start) = .; \ + __kprobes_text_start = .; \ *(.kprobes.text) \ - VMLINUX_SYMBOL(__kprobes_text_end) = .; + __kprobes_text_end = .; #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__entry_text_start) = .; \ + __entry_text_start = .; \ *(.entry.text) \ - VMLINUX_SYMBOL(__entry_text_end) = .; + __entry_text_end = .; #define IRQENTRY_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__irqentry_text_start) = .; \ + __irqentry_text_start = .; \ *(.irqentry.text) \ - VMLINUX_SYMBOL(__irqentry_text_end) = .; + __irqentry_text_end = .; #define SOFTIRQENTRY_TEXT \ ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__softirqentry_text_start) = .; \ + __softirqentry_text_start = .; \ *(.softirqentry.text) \ - VMLINUX_SYMBOL(__softirqentry_text_end) = .; + __softirqentry_text_end = .; /* Section used for early init (in .S files) */ #define HEAD_TEXT KEEP(*(.head.text)) @@ -560,9 +560,9 @@ #define EXCEPTION_TABLE(align) \ . = ALIGN(align); \ __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ex_table) = .; \ + __start___ex_table = .; \ KEEP(*(__ex_table)) \ - VMLINUX_SYMBOL(__stop___ex_table) = .; \ + __stop___ex_table = .; \ } /* @@ -576,11 +576,11 @@ #ifdef CONFIG_CONSTRUCTORS #define KERNEL_CTORS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__ctors_start) = .; \ + __ctors_start = .; \ KEEP(*(.ctors)) \ KEEP(*(SORT(.init_array.*))) \ KEEP(*(.init_array)) \ - VMLINUX_SYMBOL(__ctors_end) = .; + __ctors_end = .; #else #define KERNEL_CTORS() #endif @@ -715,9 +715,9 @@ #define BUG_TABLE \ . = ALIGN(8); \ __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___bug_table) = .; \ + __start___bug_table = .; \ KEEP(*(__bug_table)) \ - VMLINUX_SYMBOL(__stop___bug_table) = .; \ + __stop___bug_table = .; \ } #else #define BUG_TABLE @@ -727,22 +727,22 @@ #define ORC_UNWIND_TABLE \ . = ALIGN(4); \ .orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_orc_unwind_ip) = .; \ + __start_orc_unwind_ip = .; \ KEEP(*(.orc_unwind_ip)) \ - VMLINUX_SYMBOL(__stop_orc_unwind_ip) = .; \ + __stop_orc_unwind_ip = .; \ } \ . = ALIGN(6); \ .orc_unwind : AT(ADDR(.orc_unwind) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_orc_unwind) = .; \ + __start_orc_unwind = .; \ KEEP(*(.orc_unwind)) \ - VMLINUX_SYMBOL(__stop_orc_unwind) = .; \ + __stop_orc_unwind = .; \ } \ . = ALIGN(4); \ .orc_lookup : AT(ADDR(.orc_lookup) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(orc_lookup) = .; \ + orc_lookup = .; \ . += (((SIZEOF(.text) + LOOKUP_BLOCK_SIZE - 1) / \ LOOKUP_BLOCK_SIZE) + 1) * 4; \ - VMLINUX_SYMBOL(orc_lookup_end) = .; \ + orc_lookup_end = .; \ } #else #define ORC_UNWIND_TABLE @@ -752,9 +752,9 @@ #define TRACEDATA \ . = ALIGN(4); \ .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__tracedata_start) = .; \ + __tracedata_start = .; \ KEEP(*(.tracedata)) \ - VMLINUX_SYMBOL(__tracedata_end) = .; \ + __tracedata_end = .; \ } #else #define TRACEDATA @@ -762,24 +762,24 @@ #define NOTES \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_notes) = .; \ + __start_notes = .; \ KEEP(*(.note.*)) \ - VMLINUX_SYMBOL(__stop_notes) = .; \ + __stop_notes = .; \ } #define INIT_SETUP(initsetup_align) \ . = ALIGN(initsetup_align); \ - VMLINUX_SYMBOL(__setup_start) = .; \ + __setup_start = .; \ KEEP(*(.init.setup)) \ - VMLINUX_SYMBOL(__setup_end) = .; + __setup_end = .; #define INIT_CALLS_LEVEL(level) \ - VMLINUX_SYMBOL(__initcall##level##_start) = .; \ + __initcall##level##_start = .; \ KEEP(*(.initcall##level##.init)) \ KEEP(*(.initcall##level##s.init)) \ #define INIT_CALLS \ - VMLINUX_SYMBOL(__initcall_start) = .; \ + __initcall_start = .; \ KEEP(*(.initcallearly.init)) \ INIT_CALLS_LEVEL(0) \ INIT_CALLS_LEVEL(1) \ @@ -790,22 +790,22 @@ INIT_CALLS_LEVEL(rootfs) \ INIT_CALLS_LEVEL(6) \ INIT_CALLS_LEVEL(7) \ - VMLINUX_SYMBOL(__initcall_end) = .; + __initcall_end = .; #define CON_INITCALL \ - VMLINUX_SYMBOL(__con_initcall_start) = .; \ + __con_initcall_start = .; \ KEEP(*(.con_initcall.init)) \ - VMLINUX_SYMBOL(__con_initcall_end) = .; + __con_initcall_end = .; #define SECURITY_INITCALL \ - VMLINUX_SYMBOL(__security_initcall_start) = .; \ + __security_initcall_start = .; \ KEEP(*(.security_initcall.init)) \ - VMLINUX_SYMBOL(__security_initcall_end) = .; + __security_initcall_end = .; #ifdef CONFIG_BLK_DEV_INITRD #define INIT_RAM_FS \ . = ALIGN(4); \ - VMLINUX_SYMBOL(__initramfs_start) = .; \ + __initramfs_start = .; \ KEEP(*(.init.ramfs)) \ . = ALIGN(8); \ KEEP(*(.init.ramfs.info)) @@ -860,7 +860,7 @@ * sharing between subsections for different purposes. */ #define PERCPU_INPUT(cacheline) \ - VMLINUX_SYMBOL(__per_cpu_start) = .; \ + __per_cpu_start = .; \ *(.data..percpu..first) \ . = ALIGN(PAGE_SIZE); \ *(.data..percpu..page_aligned) \ @@ -870,7 +870,7 @@ *(.data..percpu) \ *(.data..percpu..shared_aligned) \ PERCPU_DECRYPTED_SECTION \ - VMLINUX_SYMBOL(__per_cpu_end) = .; + __per_cpu_end = .; /** * PERCPU_VADDR - define output section for percpu area @@ -897,12 +897,11 @@ * address, use PERCPU_SECTION. */ #define PERCPU_VADDR(cacheline, vaddr, phdr) \ - VMLINUX_SYMBOL(__per_cpu_load) = .; \ - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - - LOAD_OFFSET) { \ + __per_cpu_load = .; \ + .data..percpu vaddr : AT(__per_cpu_load - LOAD_OFFSET) { \ PERCPU_INPUT(cacheline) \ } phdr \ - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu); + . = __per_cpu_load + SIZEOF(.data..percpu); /** * PERCPU_SECTION - define output section for percpu area, simple version @@ -919,7 +918,7 @@ #define PERCPU_SECTION(cacheline) \ . = ALIGN(PAGE_SIZE); \ .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__per_cpu_load) = .; \ + __per_cpu_load = .; \ PERCPU_INPUT(cacheline) \ } @@ -958,9 +957,9 @@ #define INIT_TEXT_SECTION(inittext_align) \ . = ALIGN(inittext_align); \ .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(_sinittext) = .; \ + _sinittext = .; \ INIT_TEXT \ - VMLINUX_SYMBOL(_einittext) = .; \ + _einittext = .; \ } #define INIT_DATA_SECTION(initsetup_align) \ @@ -975,8 +974,8 @@ #define BSS_SECTION(sbss_align, bss_align, stop_align) \ . = ALIGN(sbss_align); \ - VMLINUX_SYMBOL(__bss_start) = .; \ + __bss_start = .; \ SBSS(sbss_align) \ BSS(bss_align) \ . = ALIGN(stop_align); \ - VMLINUX_SYMBOL(__bss_stop) = .; + __bss_stop = .; From patchwork Wed May 9 07:23:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135203 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5308983lji; Wed, 9 May 2018 00:25:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoVKGVkCcSEtLHLIfAdUCRYcU8SoYNkH8816xFBjHu8oqkOb2I4KaXFt6ZO5A/j4N4MQ5KC X-Received: by 2002:a65:5002:: with SMTP id f2-v6mr6256823pgo.232.1525850703626; Wed, 09 May 2018 00:25:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850703; cv=none; d=google.com; s=arc-20160816; b=ExM9+7RJwuJvS42vkYQqDwdJ+mfTo1zfhs1t3Whhv2Z8cPu8H9C6i+wFJhH1d3Czvu pR3/vtTaKfCb1F1f5JO9YZS0+JFgU/ww8FulgekPvv6GcoS9Nsp32/xhUawnWN0nlycZ XUCcGwJlLs9arPq9k01YMiZTvIdTO+HYJEZaZHkva0/ZyTXchhaAS+3JFgjSbm66U/1k 8qzn0CW3Ojc/X8GoYnrfZrJVDSTakiyAE3p7IOotlyXZVk6BSIavgcqC33lSeO5LBhts 2DgN6hrAgurPMVOLnCdpHR3yUa2PYHJEuYSpNmFJlQnwpWCGyjQYpojr37ecx/x9Yka6 TQWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=L2fQS49HxVEugngAE8I9UV4Tz6W1iACKX9VwT5t0vz0=; b=QRgywMixq7vMP4Ecm9FCRglSKGVak8acORNaD8rn/+eJmsmyeZQIDSZdRbe+Jo56T4 Rn3JgtUxXedDELfIzgXZ/hiNHeKNyYAHidkQ7j4dahAl7sQ7PrSchC20tY/Buref4FES fd88lU+pvFP5R9kNpFnLHMCt0FUIdAtJ9L0hV7W9nDUg2kBaEod6A89AzqBKVkHtaoTC XavfYG6VYwVsudAxx2QvfeAvLucdnxmR5LzxKxNULyYNMLJWk537X2I0B0pnMDswTboC m0RXtTGhJmbePQOL6TIlp3K1mg+zFbMfDCuZaG0G745sC4eOhRRCKs9ZMblvSmD7xzY+ zCQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=M09y/k+5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f28-v6si27519186plj.255.2018.05.09.00.25.03; Wed, 09 May 2018 00:25:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=M09y/k+5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933777AbeEIHY7 (ORCPT + 29 others); Wed, 9 May 2018 03:24:59 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50795 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756214AbeEIHYw (ORCPT ); Wed, 9 May 2018 03:24:52 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36K028852; Wed, 9 May 2018 16:24:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36K028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850649; bh=L2fQS49HxVEugngAE8I9UV4Tz6W1iACKX9VwT5t0vz0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M09y/k+5zX11O0gzEa/raiULj/2OmBVZaGUKQnS8I2YrUTUwN3GA9/JRKxAQXI1ts EmxDCdPmHAh5sGXLVbcRZfxa4k6+SNf1zKmXC6GLZXeU+dYlpTCT7Gg1xRhFt6tba9 0oIzYjLetCcGqoU65qgTn5HHWscygyRo5Kz5FzIGIPYP8Ykz8XX+0zE91UATqC19Ka KaVpWz7ukdiJQ0rzarvf0T6tUw77hZIgbfZmracV+WcTzpwbmeKIMHzU8t8gM+uPmV jVod2dR/KXMDBWfkAlvnBn0BPeZvnMhgZj8A9Ww3TLHF+3s5+fkzskZl0aQBztH+to xGNjkVjz49qtA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Andy Whitcroft , linux-kernel@vger.kernel.org Subject: [PATCH 8/8] checkpatch: remove VMLINUX_SYMBOL() check Date: Wed, 9 May 2018 16:23:52 +0900 Message-Id: <1525850632-10921-9-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that VMLINUX_SYMBOL() is no-op and being removed, let's stop checking VMLINUX_SYMBOL(). Signed-off-by: Masahiro Yamada --- scripts/checkpatch.pl | 10 ---------- 1 file changed, 10 deletions(-) -- 2.7.4 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index e16d671..ce582a8 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -5121,16 +5121,6 @@ sub process { } } -# make sure symbols are always wrapped with VMLINUX_SYMBOL() ... -# all assignments may have only one of the following with an assignment: -# . -# ALIGN(...) -# VMLINUX_SYMBOL(...) - if ($realfile eq 'vmlinux.lds.h' && $line =~ /(?:(?:^|\s)$Ident\s*=|=\s*$Ident(?:\s|$))/) { - WARN("MISSING_VMLINUX_SYMBOL", - "vmlinux.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr); - } - # check for redundant bracing round if etc if ($line =~ /(^.*)\bif\b/ && $1 !~ /else\s*$/) { my ($level, $endln, @chunks) =