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/s390 | |
| 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 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/livepatch.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h deleted file mode 100644 index 5209f223331a..000000000000 --- a/arch/s390/include/asm/livepatch.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * livepatch.h - s390-specific Kernel Live Patching Core - * - * Copyright (c) 2013-2015 SUSE - * Authors: Jiri Kosina - * Vojtech Pavlik - * Jiri Slaby - */ - -#ifndef ASM_LIVEPATCH_H -#define ASM_LIVEPATCH_H - -#include <linux/ftrace.h> -#include <asm/ptrace.h> - -static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) -{ - ftrace_instruction_pointer_set(fregs, ip); -} - -#endif |