From: <gregkh@linuxfoundation.org>
To: alexander.sverdlin@nokia.com, f.fainelli@gmail.com,
gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org,
linux@armlinux.org.uk, mingo@redhat.com,
rmk+kernel@armlinux.org.uk, rostedt@goodmis.org,
sashal@kernel.org
Cc: <stable-commits@vger.kernel.org>
Subject: Patch "ARM: 9077/1: PLT: Move struct plt_entries definition to header" has been added to the 5.4-stable tree
Date: Thu, 23 Sep 2021 12:36:05 +0200 [thread overview]
Message-ID: <1632393365162108@kroah.com> (raw)
In-Reply-To: <20210922170034.190023-2-f.fainelli@gmail.com>
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.4-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.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From foo@baz Thu Sep 23 12:31:59 PM CEST 2021
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Wed, 22 Sep 2021 10:00:31 -0700
Subject: ARM: 9077/1: PLT: Move struct plt_entries definition to header
To: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>, Alex Sverdlin <alexander.sverdlin@nokia.com>, Russell King <rmk+kernel@armlinux.org.uk>, Florian Fainelli <f.fainelli@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>, Russell King <linux@armlinux.org.uk>, linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT)
Message-ID: <20210922170034.190023-2-f.fainelli@gmail.com>
From: Alex Sverdlin <alexander.sverdlin@nokia.com>
commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream
No functional change, later it will be re-used in several files.
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@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
@@ -11,10 +11,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))
@@ -23,11 +19,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@gmail.com are
queue-5.4/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch
queue-5.4/arm-9079-1-ftrace-add-module_plts-support.patch
queue-5.4/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch
queue-5.4/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch
queue-5.4/arm-qualify-enabling-of-swiotlb_init.patch
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-09-23 10:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 17:00 [PATCH stable 5.4 v2 0/4] ARM: ftrace MODULE_PLTS warning Florian Fainelli
2021-09-22 17:00 ` Florian Fainelli
2021-09-22 17:00 ` [PATCH stable 5.4 v2 1/4] ARM: 9077/1: PLT: Move struct plt_entries definition to header Florian Fainelli
2021-09-22 17:00 ` Florian Fainelli
2021-09-23 10:36 ` gregkh [this message]
2021-09-22 17:00 ` [PATCH stable 5.4 v2 2/4] ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link() Florian Fainelli
2021-09-22 17:00 ` Florian Fainelli
2021-09-23 10:36 ` Patch "ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link()" has been added to the 5.4-stable tree gregkh
2021-09-22 17:00 ` [PATCH stable 5.4 v2 3/4] ARM: 9079/1: ftrace: Add MODULE_PLTS support Florian Fainelli
2021-09-22 17:00 ` Florian Fainelli
2021-09-23 10:36 ` Patch "ARM: 9079/1: ftrace: Add MODULE_PLTS support" has been added to the 5.4-stable tree gregkh
2021-09-22 17:00 ` [PATCH stable 5.4 v2 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Florian Fainelli
2021-09-22 17:00 ` Florian Fainelli
2021-09-23 10:36 ` Patch "ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE" has been added to the 5.4-stable tree gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1632393365162108@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=alexander.sverdlin@nokia.com \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@redhat.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=rostedt@goodmis.org \
--cc=sashal@kernel.org \
--cc=stable-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.