For the same reason as commit a85c728cb5e1 ("powerpc/32: Don't use
lmw/stmw for saving/restoring non volatile regs"), don't use
lmw/stmw in ftrace_regs_caller().

Use the same macros for PPC32 and PPC64.

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/kernel/trace/ftrace_mprofile.S | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/kernel/trace/ftrace_mprofile.S 
b/arch/powerpc/kernel/trace/ftrace_mprofile.S
index 89639e64acd1..76dab07fd8fd 100644
--- a/arch/powerpc/kernel/trace/ftrace_mprofile.S
+++ b/arch/powerpc/kernel/trace/ftrace_mprofile.S
@@ -43,18 +43,16 @@ _GLOBAL(ftrace_regs_caller)
 
        /* Save all gprs to pt_regs */
        SAVE_GPR(0, r1)
-#ifdef CONFIG_PPC64
        SAVE_GPRS(2, 11, r1)
 
+#ifdef CONFIG_PPC64
        /* Ok to continue? */
        lbz     r3, PACA_FTRACE_ENABLED(r13)
        cmpdi   r3, 0
        beq     ftrace_no_trace
+#endif
 
        SAVE_GPRS(12, 31, r1)
-#else
-       stmw    r2, GPR2(r1)
-#endif
 
        /* Save previous stack pointer (r1) */
        addi    r8, r1, SWITCH_FRAME_SIZE
@@ -120,11 +118,7 @@ ftrace_regs_call:
 #endif
 
        /* Restore gprs */
-#ifdef CONFIG_PPC64
        REST_GPRS(2, 31, r1)
-#else
-       lmw     r2, GPR2(r1)
-#endif
 
        /* Restore possibly modified LR */
        PPC_LL  r0, _LINK(r1)
-- 
2.34.1

Reply via email to