| From fdd2cd0c76871dd5cd854789b0b737c440aa944a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 23 Oct 2023 02:06:09 +0900 |
| Subject: modpost: remove EXIT_SECTIONS macro |
| |
| From: Masahiro Yamada <masahiroy@kernel.org> |
| |
| [ Upstream commit 48cd8df7afd1eef22cf7b125697a6d7c3d168c5c ] |
| |
| ALL_EXIT_SECTIONS and EXIT_SECTIONS are the same. Remove the latter. |
| |
| Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> |
| Stable-dep-of: bb43a59944f4 ("Rename .data.unlikely to .data..unlikely") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| scripts/mod/modpost.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c |
| index e43862cd002e2..0426c1bf3a69c 100644 |
| --- a/scripts/mod/modpost.c |
| +++ b/scripts/mod/modpost.c |
| @@ -808,7 +808,7 @@ static void check_section(const char *modname, struct elf_info *elf, |
| #define ALL_XXXINIT_SECTIONS ".meminit.*" |
| |
| #define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS |
| -#define ALL_EXIT_SECTIONS EXIT_SECTIONS |
| +#define ALL_EXIT_SECTIONS ".exit.*" |
| |
| #define DATA_SECTIONS ".data", ".data.rel" |
| #define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \ |
| @@ -820,8 +820,6 @@ static void check_section(const char *modname, struct elf_info *elf, |
| |
| #define INIT_SECTIONS ".init.*" |
| |
| -#define EXIT_SECTIONS ".exit.*" |
| - |
| #define ALL_TEXT_SECTIONS ALL_INIT_TEXT_SECTIONS, ALL_EXIT_TEXT_SECTIONS, \ |
| TEXT_SECTIONS, OTHER_TEXT_SECTIONS |
| |
| @@ -1013,7 +1011,7 @@ static int secref_whitelist(const char *fromsec, const char *fromsym, |
| */ |
| if (!extra_warn && |
| match(fromsec, PATTERNS(DATA_SECTIONS)) && |
| - match(tosec, PATTERNS(EXIT_SECTIONS)) && |
| + match(tosec, PATTERNS(ALL_EXIT_SECTIONS)) && |
| match(fromsym, PATTERNS("*driver"))) |
| return 0; |
| |
| @@ -1181,7 +1179,7 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf, |
| if (match(secname, PATTERNS(INIT_SECTIONS))) |
| warn("%s: %s: EXPORT_SYMBOL used for init symbol. Remove __init or EXPORT_SYMBOL.\n", |
| mod->name, name); |
| - else if (match(secname, PATTERNS(EXIT_SECTIONS))) |
| + else if (match(secname, PATTERNS(ALL_EXIT_SECTIONS))) |
| warn("%s: %s: EXPORT_SYMBOL used for exit symbol. Remove __exit or EXPORT_SYMBOL.\n", |
| mod->name, name); |
| } |
| -- |
| 2.43.0 |
| |