Commit b3adc384 authored by Joey Gouly's avatar Joey Gouly Committed by Catalin Marinas
Browse files

arm64: module: move find_section to header 



Move it to the header so that the implementation can be shared
by the alternatives code.

Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Cc: Will Deacon <will@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220830104833.34636-2-joey.gouly@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b90cb105

arch/arm64/include/asm/module.h

+15 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm64/kernel/module.c

+0 −15
Original line number Diff line number Diff line
@@ -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);