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/x86 | |
| parent | 12831f6486f9db5a8f2c87129f2b8f33349b1e04 (diff) | |
| parent | 5d7c854593a460706dacf8e1b16c9bdcb1c2d7bb (diff) | |
| download | linux-stable-7c9e960c636306f632ccae623bf94b2b53d35cbd.tar.gz linux-stable-7c9e960c636306f632ccae623bf94b2b53d35cbd.tar.bz2 linux-stable-7c9e960c636306f632ccae623bf94b2b53d35cbd.zip | |
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/x86')
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h deleted file mode 100644 index 7c5cc6660e4b..000000000000 --- a/arch/x86/include/asm/livepatch.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * livepatch.h - x86-specific Kernel Live Patching Core - * - * Copyright (C) 2014 Seth Jennings <sjenning@redhat.com> - * Copyright (C) 2014 SUSE - */ - -#ifndef _ASM_X86_LIVEPATCH_H -#define _ASM_X86_LIVEPATCH_H - -#include <asm/setup.h> -#include <linux/ftrace.h> - -static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) -{ - ftrace_instruction_pointer_set(fregs, ip); -} - -#endif /* _ASM_X86_LIVEPATCH_H */ |