From 5f0f95f1e1b64fe55679059837dafb3439b57012 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Fri, 25 Jun 2021 11:13:16 +0000 Subject: [PATCH] powerpc/ptrace: Move set_return_regs_changed() before regs_set_return_{msr/ip} regs_set_return_msr() and regs_set_return_ip() have a copy of the code of set_return_regs_changed(). Move up set_return_regs_changed() so it can be reused by regs_set_return_{msr/ip} Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/49f4fb051a3e1cb69f7305d5b6768aec14727c32.1624619582.git.christophe.leroy@csgroup.eu --- arch/powerpc/include/asm/ptrace.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index fcf63f5..14b8105 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -135,26 +135,26 @@ extern unsigned long profile_pc(struct pt_regs *regs); long do_syscall_trace_enter(struct pt_regs *regs); void do_syscall_trace_leave(struct pt_regs *regs); -static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) +static inline void set_return_regs_changed(void) { - regs->nip = ip; #ifdef CONFIG_PPC_BOOK3S_64 local_paca->hsrr_valid = 0; local_paca->srr_valid = 0; #endif } -static inline void regs_set_return_msr(struct pt_regs *regs, unsigned long msr) +static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) { - regs->msr = msr; + regs->nip = ip; #ifdef CONFIG_PPC_BOOK3S_64 local_paca->hsrr_valid = 0; local_paca->srr_valid = 0; #endif } -static inline void set_return_regs_changed(void) +static inline void regs_set_return_msr(struct pt_regs *regs, unsigned long msr) { + regs->msr = msr; #ifdef CONFIG_PPC_BOOK3S_64 local_paca->hsrr_valid = 0; local_paca->srr_valid = 0; -- 2.7.4