diff options
| author | Will Deacon <will@kernel.org> | 2022-12-06 11:07:39 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-12-06 11:07:39 +0000 |
| commit | a4aebff7ef608880149851e0679e3ab455c0d42f (patch) | |
| tree | 6c81284c196878118b925085cd55b4818e601373 /arch/arm64/kernel/module.c | |
| parent | 1a916ed79bc0e94c98001e36403b5c014a222fb4 (diff) | |
| parent | cfce092dae95ed81391e49f273353a96cc6dec64 (diff) | |
Merge branch 'for-next/ftrace' into for-next/core
* for-next/ftrace:
ftrace: arm64: remove static ftrace
ftrace: arm64: move from REGS to ARGS
ftrace: abstract DYNAMIC_FTRACE_WITH_ARGS accesses
ftrace: rename ftrace_instruction_pointer_set() -> ftrace_regs_set_instruction_pointer()
ftrace: pass fregs to arch_ftrace_set_direct_caller()
Diffstat (limited to 'arch/arm64/kernel/module.c')
| -rw-r--r-- | arch/arm64/kernel/module.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index fa7b3228944b..5af4975caeb5 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -499,9 +499,6 @@ static int module_init_ftrace_plt(const Elf_Ehdr *hdr, __init_plt(&plts[FTRACE_PLT_IDX], FTRACE_ADDR); - if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS)) - __init_plt(&plts[FTRACE_REGS_PLT_IDX], FTRACE_REGS_ADDR); - mod->arch.ftrace_trampolines = plts; #endif return 0; |