Drop modpost-include-.text.-in-text_sections.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/modpost-include-.text.-in-text_sections.patch b/queue-5.15/modpost-include-.text.-in-text_sections.patch
deleted file mode 100644 (file)
index f933bae..0000000
--- a/queue-5.15/modpost-include-.text.-in-text_sections.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dc17488354b9dd27b5d2edcd64fc12d0a97281c5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Dec 2022 11:35:29 -0700
-Subject: modpost: Include '.text.*' in TEXT_SECTIONS
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-[ Upstream commit 19331e84c3873256537d446afec1f6c507f8c4ef ]
-
-Commit 6c730bfc894f ("modpost: handle -ffunction-sections") added
-".text.*" to the OTHER_TEXT_SECTIONS macro to fix certain section
-mismatch warnings. Unfortunately, this makes it impossible for modpost
-to warn about section mismatches with LTO, which implies
-'-ffunction-sections', as all functions are put in their own
-'.text.<func_name>' sections, which may still reference functions in
-sections they are not supposed to, such as __init.
-
-Fix this by moving ".text.*" into TEXT_SECTIONS, so that configurations
-with '-ffunction-sections' will see warnings about mismatched sections.
-
-Link: https://lore.kernel.org/Y39kI3MOtVI5BAnV@google.com/
-Reported-by: Vincent Donnefort <vdonnefort@google.com>
-Reviewed-and-tested-by: Alexander Lobakin <alexandr.lobakin@intel.com>
-Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
-Tested-by: Vincent Donnefort <vdonnefort@google.com>
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-Stable-dep-of: 397586506c3d ("modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/mod/modpost.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index c6e655e0ed988..43bacdee5cc5d 100644
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -936,10 +936,10 @@ static void check_section(const char *modname, struct elf_info *elf,
- #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
- 
- #define DATA_SECTIONS ".data", ".data.rel"
--#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
-+#define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \
-               ".kprobes.text", ".cpuidle.text", ".noinstr.text"
- #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
--              ".fixup", ".entry.text", ".exception.text", ".text.*", \
-+              ".fixup", ".entry.text", ".exception.text", \
-               ".coldtext", ".softirqentry.text"
- 
- #define INIT_SECTIONS      ".init.*"
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 05e0ecc7aa3977497d89acf2ec0c29e4c7b19692..91fc69c3e1af66e121a5655cc0da10b8cde54a63 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -41,7 +41,6 @@ nfp-flower-add-goto_chain_index-for-ct-entry.patch
 nfp-flower-add-hardware-offload-check-for-post-ct-en.patch
 selftests-mm-switch-to-bash-from-sh.patch
 selftests-mm-fix-map_hugetlb-failure-on-64k-page-siz.patch
-modpost-include-.text.-in-text_sections.patch
 xhci-process-isoc-td-properly-when-there-was-a-trans.patch
 xhci-handle-isoc-babble-and-buffer-overrun-events-pr.patch
 serial-max310x-use-regmap-methods-for-spi-batch-oper.patch