drop queue-5.10/arm-decompressor-include-.data.rel.ro.local.patch

diff --git a/queue-5.10/arm-decompressor-include-.data.rel.ro.local.patch b/queue-5.10/arm-decompressor-include-.data.rel.ro.local.patch
deleted file mode 100644 (file)
index 6964e7e..0000000
--- a/queue-5.10/arm-decompressor-include-.data.rel.ro.local.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ac78531ae562e537148a7b26287c383d6cdc2dc3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Sep 2022 15:41:03 -0700
-Subject: ARM: decompressor: Include .data.rel.ro.local
-
-From: Kees Cook <keescook@chromium.org>
-
-[ Upstream commit 1b64daf413acd86c2c13f5443f6b4ef3690c8061 ]
-
-The .data.rel.ro.local section has the same semantics as .data.rel.ro
-here, so include it in the .rodata section of the decompressor.
-Additionally since the .printk_index section isn't usable outside of
-the core kernel, discard it in the decompressor. Avoids these warnings:
-
-arm-linux-gnueabi-ld: warning: orphan section `.data.rel.ro.local' from `arch/arm/boot/compressed/fdt_rw.o' being placed in section `.data.rel.ro.local'
-arm-linux-gnueabi-ld: warning: orphan section `.printk_index' from `arch/arm/boot/compressed/fdt_rw.o' being placed in section `.printk_index'
-
-Reported-by: kernel test robot <lkp@intel.com>
-Link: https://lore.kernel.org/linux-mm/202209080545.qMIVj7YM-lkp@intel.com
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: linux-arm-kernel@lists.infradead.org
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/compressed/vmlinux.lds.S | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S
-index 1bcb68ac4b01..3fcb3e62dc56 100644
---- a/arch/arm/boot/compressed/vmlinux.lds.S
-+++ b/arch/arm/boot/compressed/vmlinux.lds.S
-@@ -23,6 +23,7 @@ SECTIONS
-     *(.ARM.extab*)
-     *(.note.*)
-     *(.rel.*)
-+    *(.printk_index)
-     /*
-      * Discard any r/w data - this produces a link error if we have any,
-      * which is required for PIC decompression.  Local data generates
-@@ -57,6 +58,7 @@ SECTIONS
-     *(.rodata)
-     *(.rodata.*)
-     *(.data.rel.ro)
-+    *(.data.rel.ro.*)
-   }
-   .piggydata : {
-     *(.piggydata)
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 9cc2fb8ab73237074dbc38845b06acc5cc682ca6..df494ad2ff6455e192c9e9ea16d6a65ff77d12b1 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -298,7 +298,6 @@ acpi-video-add-toshiba-satellite-portege-z830-quirk.patch
 mips-bcm47xx-cast-memcmp-of-function-to-void.patch
 powercap-intel_rapl-fix-ubsan-shift-out-of-bounds-is.patch
 thermal-intel_powerclamp-use-get_cpu-instead-of-smp_.patch
-arm-decompressor-include-.data.rel.ro.local.patch
 x86-entry-work-around-clang-__bdos-bug.patch
 nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
 nfsd-fix-use-after-free-on-source-server-when-doing-.patch