[PATCH v1 1/3] arm64: module: move find_section to header
Mark Rutland
mark.rutland at arm.com
Thu Aug 25 06:19:55 PDT 2022
On Thu, Aug 25, 2022 at 11:20:23AM +0100, Joey Gouly wrote:
> Move it to the header so that the implementation can be shared
> by the alternatives code.
>
> Signed-off-by: Joey Gouly <joey.gouly at arm.com>
> Cc: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Will Deacon <will at kernel.org>
Acked-by: Mark Rutland <mark.rutland at arm.com>
Mark.
> ---
> arch/arm64/include/asm/module.h | 15 +++++++++++++++
> arch/arm64/kernel/module.c | 15 ---------------
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h
> index 4e7fa2623896..22f1be47cc92 100644
> --- a/arch/arm64/include/asm/module.h
> +++ b/arch/arm64/include/asm/module.h
> @@ -65,4 +65,19 @@ static inline bool plt_entry_is_initialized(const struct plt_entry *e)
> return e->adrp || e->add || e->br;
> }
>
> +static inline const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
> + const Elf_Shdr *sechdrs,
> + const char *name)
> +{
> + const Elf_Shdr *s, *se;
> + const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
> +
> + for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
> + if (strcmp(name, secstrs + s->sh_name) == 0)
> + return s;
> + }
> +
> + return NULL;
> +}
> +
> #endif /* __ASM_MODULE_H */
> diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c
> index f2d4bb14bfab..76b41e4ca9fa 100644
> --- a/arch/arm64/kernel/module.c
> +++ b/arch/arm64/kernel/module.c
> @@ -476,21 +476,6 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
> return -ENOEXEC;
> }
>
> -static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
> - const Elf_Shdr *sechdrs,
> - const char *name)
> -{
> - const Elf_Shdr *s, *se;
> - const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
> -
> - for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
> - if (strcmp(name, secstrs + s->sh_name) == 0)
> - return s;
> - }
> -
> - return NULL;
> -}
> -
> static inline void __init_plt(struct plt_entry *plt, unsigned long addr)
> {
> *plt = get_plt_entry(addr, plt);
> --
> 2.17.1
>
More information about the linux-arm-kernel
mailing list