diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 08:55:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 08:55:01 -0700 |
commit | 7c9e960c636306f632ccae623bf94b2b53d35cbd (patch) | |
tree | 5c1ed6ca4a3224e406319ae28cf9a5bc7d0a9a59 /arch/powerpc/include/asm/livepatch.h | |
parent | 12831f6486f9db5a8f2c87129f2b8f33349b1e04 (diff) | |
parent | 5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb (diff) |
Merge tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching cleanup from Petr Mladek:
- Remove duplicated livepatch code [Christophe]
* tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
livepatch: Remove klp_arch_set_pc() and asm/livepatch.h
Diffstat (limited to 'arch/powerpc/include/asm/livepatch.h')
-rw-r--r-- | arch/powerpc/include/asm/livepatch.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h index 1c60094ea0cd..d044a1fd4f44 100644 --- a/arch/powerpc/include/asm/livepatch.h +++ b/arch/powerpc/include/asm/livepatch.h @@ -7,17 +7,9 @@ #ifndef _ASM_POWERPC_LIVEPATCH_H #define _ASM_POWERPC_LIVEPATCH_H -#include <linux/module.h> -#include <linux/ftrace.h> +#include <linux/sched.h> #include <linux/sched/task_stack.h> -#ifdef CONFIG_LIVEPATCH -static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) -{ - ftrace_instruction_pointer_set(fregs, ip); -} -#endif /* CONFIG_LIVEPATCH */ - #ifdef CONFIG_LIVEPATCH_64 static inline void klp_init_thread_info(struct task_struct *p) { |