diff options
| author |   Heiko Carstens <hca@linux.ibm.com> | 2021-10-04 16:16:45 +0200 |
|---|---|---|
| committer |   Vasily Gorbik <gor@linux.ibm.com> | 2021-10-11 20:55:58 +0200 |
| commit | 176510ebecd1ca201a8808dbbee9991eca005207 (patch) | |
| tree | b674115505ff1676fc79507337f9fb8d587352b6 /arch/s390/include/asm | |
| parent | s390/ftrace: add HAVE_DYNAMIC_FTRACE_WITH_ARGS support (diff) | |
| download | linux-dev-176510ebecd1ca201a8808dbbee9991eca005207.tar.xz linux-dev-176510ebecd1ca201a8808dbbee9991eca005207.zip | |
s390/ftrace: add ftrace_instruction_pointer_set() helper function
Add ftrace_instruction_pointer_set() helper function to match x86.
See commit 2860cd8a2353 ("livepatch: Use the default ftrace_ops
instead of REGS when ARGS is available").
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/ftrace.h | 8 | ||||
| -rw-r--r-- | arch/s390/include/asm/livepatch.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h index 98c066cb347f..3baceb4a7d3c 100644 --- a/arch/s390/include/asm/ftrace.h +++ b/arch/s390/include/asm/ftrace.h @@ -51,6 +51,14 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs * return &fregs->regs; } +static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs, + unsigned long ip) +{ + struct pt_regs *regs = arch_ftrace_get_regs(fregs); + + regs->psw.addr = ip; +} + /* * Even though the system call numbers are identical for s390/s390x a * different system call table is used for compat tasks. This may lead diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h index d578a8c76676..5209f223331a 100644 --- a/arch/s390/include/asm/livepatch.h +++ b/arch/s390/include/asm/livepatch.h @@ -16,9 +16,7 @@ static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) { - struct pt_regs *regs = ftrace_get_regs(fregs); - - regs->psw.addr = ip; + ftrace_instruction_pointer_set(fregs, ip); } #endif |