aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/include/asm/module.h2
-rw-r--r--arch/arm64/kernel/module-plts.c2
-rw-r--r--arch/arm64/kernel/module.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h
index b6dbbe3123a9..97d0ef12e2ff 100644
--- a/arch/arm64/include/asm/module.h
+++ b/arch/arm64/include/asm/module.h
@@ -39,7 +39,7 @@ struct mod_arch_specific {
39u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela, 39u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela,
40 Elf64_Sym *sym); 40 Elf64_Sym *sym);
41 41
42u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val); 42u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val);
43 43
44#ifdef CONFIG_RANDOMIZE_BASE 44#ifdef CONFIG_RANDOMIZE_BASE
45extern u64 module_alloc_base; 45extern u64 module_alloc_base;
diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c
index fa3637284a3d..f0690c2ca3e0 100644
--- a/arch/arm64/kernel/module-plts.c
+++ b/arch/arm64/kernel/module-plts.c
@@ -43,7 +43,7 @@ u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela,
43} 43}
44 44
45#ifdef CONFIG_ARM64_ERRATUM_843419 45#ifdef CONFIG_ARM64_ERRATUM_843419
46u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val) 46u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val)
47{ 47{
48 struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core : 48 struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core :
49 &mod->arch.init; 49 &mod->arch.init;
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c
index 719fde8dcc19..155fd91e78f4 100644
--- a/arch/arm64/kernel/module.c
+++ b/arch/arm64/kernel/module.c
@@ -215,7 +215,7 @@ static int reloc_insn_adrp(struct module *mod, __le32 *place, u64 val)
215 insn &= ~BIT(31); 215 insn &= ~BIT(31);
216 } else { 216 } else {
217 /* out of range for ADR -> emit a veneer */ 217 /* out of range for ADR -> emit a veneer */
218 val = module_emit_adrp_veneer(mod, place, val & ~0xfff); 218 val = module_emit_veneer_for_adrp(mod, place, val & ~0xfff);
219 if (!val) 219 if (!val)
220 return -ENOEXEC; 220 return -ENOEXEC;
221 insn = aarch64_insn_gen_branch_imm((u64)place, val, 221 insn = aarch64_insn_gen_branch_imm((u64)place, val,