Patch "ARM: 9077/1: PLT: Move struct plt_entries definition to header" has been added to the 5.10-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    ARM: 9077/1: PLT: Move struct plt_entries definition to header

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From foo at baz Thu Sep 23 11:03:54 AM CEST 2021
From: Florian Fainelli <f.fainelli at gmail.com>
Date: Wed, 22 Sep 2021 09:59:55 -0700
Subject: ARM: 9077/1: PLT: Move struct plt_entries definition to header
To: linux-kernel at vger.kernel.org
Cc: stable at vger.kernel.org, Greg Kroah-Hartman <gregkh at linuxfoundation.org>, Sasha Levin <sashal at kernel.org>, Alex Sverdlin <alexander.sverdlin at nokia.com>, Russell King <rmk+kernel at armlinux.org.uk>, Florian Fainelli <f.fainelli at gmail.com>, Steven Rostedt <rostedt at goodmis.org>, Ingo Molnar <mingo at redhat.com>, Russell King <linux at armlinux.org.uk>, linux-arm-kernel at lists.infradead.org (moderated list:ARM PORT)
Message-ID: <20210922165958.189843-2-f.fainelli at gmail.com>

From: Alex Sverdlin <alexander.sverdlin at nokia.com>

commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream upstream

No functional change, later it will be re-used in several files.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin at nokia.com>
Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 arch/arm/include/asm/module.h |    9 +++++++++
 arch/arm/kernel/module-plts.c |    9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -19,6 +19,15 @@ enum {
 };
 #endif
 
+#define PLT_ENT_STRIDE		L1_CACHE_BYTES
+#define PLT_ENT_COUNT		(PLT_ENT_STRIDE / sizeof(u32))
+#define PLT_ENT_SIZE		(sizeof(struct plt_entries) / PLT_ENT_COUNT)
+
+struct plt_entries {
+	u32	ldr[PLT_ENT_COUNT];
+	u32	lit[PLT_ENT_COUNT];
+};
+
 struct mod_plt_sec {
 	struct elf32_shdr	*plt;
 	int			plt_count;
--- a/arch/arm/kernel/module-plts.c
+++ b/arch/arm/kernel/module-plts.c
@@ -12,10 +12,6 @@
 #include <asm/cache.h>
 #include <asm/opcodes.h>
 
-#define PLT_ENT_STRIDE		L1_CACHE_BYTES
-#define PLT_ENT_COUNT		(PLT_ENT_STRIDE / sizeof(u32))
-#define PLT_ENT_SIZE		(sizeof(struct plt_entries) / PLT_ENT_COUNT)
-
 #ifdef CONFIG_THUMB2_KERNEL
 #define PLT_ENT_LDR		__opcode_to_mem_thumb32(0xf8dff000 | \
 							(PLT_ENT_STRIDE - 4))
@@ -24,11 +20,6 @@
 						    (PLT_ENT_STRIDE - 8))
 #endif
 
-struct plt_entries {
-	u32	ldr[PLT_ENT_COUNT];
-	u32	lit[PLT_ENT_COUNT];
-};
-
 static bool in_init(const struct module *mod, unsigned long loc)
 {
 	return loc - (u32)mod->init_layout.base < mod->init_layout.size;


Patches currently in stable-queue which might be from f.fainelli at gmail.com are

queue-5.10/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch
queue-5.10/arm-9079-1-ftrace-add-module_plts-support.patch
queue-5.10/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch
queue-5.10/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch
queue-5.10/arm-qualify-enabling-of-swiotlb_init.patch