[PATCH 2/2] powerpc/ptrace: Refactor regs_set_return_{msr/ip}
flat view
STALE1945d
LANDED
From: Christophe Leroy <hidden>
Date: 2021-06-25 11:13:24
Also in:
lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), ptrace support, the rest · Maintainers:
Madhavan Srinivasan, Oleg Nesterov, Linus Torvalds
Landed in mainline as cae4644673ec on 2021-06-25.
regs_set_return_msr() and regs_set_return_ip() have a copy of the code of set_return_regs_changed(). Call the later instead. Signed-off-by: Christophe Leroy <redacted> --- arch/powerpc/include/asm/ptrace.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 14b8105a1e27..3e5d470a6155 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h@@ -146,19 +146,13 @@ static inline void set_return_regs_changed(void) static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) { regs->nip = ip; -#ifdef CONFIG_PPC_BOOK3S_64 - local_paca->hsrr_valid = 0; - local_paca->srr_valid = 0; -#endif + set_return_regs_changed(); } 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; -#endif + set_return_regs_changed(); } static inline void regs_add_return_ip(struct pt_regs *regs, long offset)
--
2.25.0