diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2022-03-28 08:26:48 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2022-05-24 08:46:37 +0200 |
| commit | 5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb (patch) | |
| tree | f162d897bc378a2847c8b6db9b4a5e5283c48142 /kernel/livepatch | |
| parent | Merge tag 'livepatching-for-5.18' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb.tar.xz linux-5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb.zip | |
livepatch: Remove klp_arch_set_pc() and asm/livepatch.h
All three versions of klp_arch_set_pc() do exactly the same: they
call ftrace_instruction_pointer_set().
Call ftrace_instruction_pointer_set() directly and remove
klp_arch_set_pc().
As klp_arch_set_pc() was the only thing remaining in asm/livepatch.h
on x86 and s390, remove asm/livepatch.h
livepatch.h remains on powerpc but its content is exclusively used
by powerpc specific code.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Petr Mladek <pmladek@suse.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'kernel/livepatch')
| -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 c172bf92b576..4c4f5a776d80 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; - klp_arch_set_pc(fregs, (unsigned long)func->new_func); + ftrace_instruction_pointer_set(fregs, (unsigned long)func->new_func); unlock: ftrace_test_recursion_unlock(bit); |