| From foo@baz Mon Oct 4 01:06:28 PM CEST 2021 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Mon, 27 Sep 2021 14:02:56 -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: <20210927210259.3216965-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 |
| @@ -14,10 +14,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)) |
| @@ -26,11 +22,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; |
