|
@@ -71,11 +71,12 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
|
|
|
int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
|
|
|
{
|
|
|
unsigned long pc = rec->ip;
|
|
|
- long offset = (long)pc - (long)addr;
|
|
|
u32 old, new;
|
|
|
|
|
|
- if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
|
|
|
- (offset < -SZ_128M || offset >= SZ_128M)) {
|
|
|
+#ifdef CONFIG_ARM64_MODULE_PLTS
|
|
|
+ long offset = (long)pc - (long)addr;
|
|
|
+
|
|
|
+ if (offset < -SZ_128M || offset >= SZ_128M) {
|
|
|
unsigned long *trampoline;
|
|
|
struct module *mod;
|
|
|
|
|
@@ -121,6 +122,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
|
|
|
}
|
|
|
addr = (unsigned long)&trampoline[1];
|
|
|
}
|
|
|
+#endif /* CONFIG_ARM64_MODULE_PLTS */
|
|
|
|
|
|
old = aarch64_insn_gen_nop();
|
|
|
new = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
|
|
@@ -135,12 +137,13 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,
|
|
|
unsigned long addr)
|
|
|
{
|
|
|
unsigned long pc = rec->ip;
|
|
|
- long offset = (long)pc - (long)addr;
|
|
|
bool validate = true;
|
|
|
u32 old = 0, new;
|
|
|
|
|
|
- if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
|
|
|
- (offset < -SZ_128M || offset >= SZ_128M)) {
|
|
|
+#ifdef CONFIG_ARM64_MODULE_PLTS
|
|
|
+ long offset = (long)pc - (long)addr;
|
|
|
+
|
|
|
+ if (offset < -SZ_128M || offset >= SZ_128M) {
|
|
|
u32 replaced;
|
|
|
|
|
|
/*
|
|
@@ -177,6 +180,7 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,
|
|
|
old = aarch64_insn_gen_branch_imm(pc, addr,
|
|
|
AARCH64_INSN_BRANCH_LINK);
|
|
|
}
|
|
|
+#endif /* CONFIG_ARM64_MODULE_PLTS */
|
|
|
|
|
|
new = aarch64_insn_gen_nop();
|
|
|
|