powerpc/ftrace: Regroup PPC64 specific operations in ftrace_mprofile.S
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Thu, 17 Feb 2022 12:01:58 +0000 (13:01 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 7 Mar 2022 13:05:01 +0000 (00:05 +1100)
CONFIG_MPROFILE_KERNEL is only for PPC64 and ftrace_mprofile.o
is build on PPC64 only when CONFIG_MPROFILE_KERNEL is defined.

Move saving of r0 inside #ifdef PPC64

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/619dfb672bf4f1b777a4b3f8b4f14e637fea2716.1645099283.git.christophe.leroy@csgroup.eu
arch/powerpc/kernel/trace/ftrace_mprofile.S

index 630b2de9957b0b32b42925eea41f2263f1fa487b..f5d31c458e6b95dffe6988e1b21064826393665e 100644 (file)
  * and then arrange for the ftrace function to be called.
  */
 .macro ftrace_regs_entry allregs
-       /* Save the original return address in A's stack frame */
-#ifdef CONFIG_MPROFILE_KERNEL
-       PPC_STL r0,LRSAVE(r1)
-#endif
-
        /* Create our stack frame + pt_regs */
        PPC_STLU        r1,-SWITCH_FRAME_SIZE(r1)
 
@@ -46,6 +41,8 @@
        SAVE_GPRS(3, 10, r1)
 
 #ifdef CONFIG_PPC64
+       /* Save the original return address in A's stack frame */
+       std     r0, LRSAVE+SWITCH_FRAME_SIZE(r1)
        /* Ok to continue? */
        lbz     r3, PACA_FTRACE_ENABLED(r13)
        cmpdi   r3, 0