diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 18:55:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 18:55:01 +0300 |
| commit | 7c9e960c636306f632ccae623bf94b2b53d35cbd (patch) | |
| tree | 5c1ed6ca4a3224e406319ae28cf9a5bc7d0a9a59 /kernel | |
| parent | 12831f6486f9db5a8f2c87129f2b8f33349b1e04 (diff) | |
| parent | 5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb (diff) | |
| download | linux-7c9e960c636306f632ccae623bf94b2b53d35cbd.tar.xz | |
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 'kernel')
| -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); |