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 /arch/powerpc/kernel/setup_64.c | |
| parent | Merge tag 'livepatching-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching (diff) | |
| download | linux-dev-5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb.tar.xz linux-dev-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 '')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index e547066a06aa..2c1e9a5ac6ca 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -59,7 +59,7 @@ #include <asm/udbg.h> #include <asm/kexec.h> #include <asm/code-patching.h> -#include <asm/livepatch.h> +#include <asm/ftrace.h> #include <asm/opal.h> #include <asm/cputhreads.h> #include <asm/hw_irq.h> |