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 /kernel/livepatch/patch.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 'kernel/livepatch/patch.c')
| -rw-r--r-- | kernel/livepatch/patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c index 4c4f5a776d80..4152c71507e2 100644 --- a/kernel/livepatch/patch.c +++ b/kernel/livepatch/patch.c @@ -118,7 +118,7 @@ static void notrace klp_ftrace_handler(unsigned long ip, if (func->nop) goto unlock; - ftrace_instruction_pointer_set(fregs, (unsigned long)func->new_func); + ftrace_regs_set_instruction_pointer(fregs, (unsigned long)func->new_func); unlock: ftrace_test_recursion_unlock(bit); |