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/s390 | |
| parent | Merge tag 'printk-for-5.19-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux (diff) | |
| parent | livepatch: Remove klp_arch_set_pc() and asm/livepatch.h (diff) | |
| download | linux-dev-7c9e960c636306f632ccae623bf94b2b53d35cbd.tar.xz linux-dev-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/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 |