1 files changed, 62 insertions, 67 deletions

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 6f7eb7e00c79..4dd38f129153 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -63,7 +63,7 @@ debug_transfer_to_handler:
 
         .globl  crit_transfer_to_handler
 crit_transfer_to_handler:
-#ifdef CONFIG_FSL_BOOKE
+#ifdef CONFIG_PPC_BOOK3E_MMU
         mfspr   r0,SPRN_MAS0
         stw     r0,MAS0(r11)
         mfspr   r0,SPRN_MAS1
@@ -78,7 +78,7 @@ crit_transfer_to_handler:
         mfspr   r0,SPRN_MAS7
         stw     r0,MAS7(r11)
 #endif /* CONFIG_PHYS_64BIT */
-#endif /* CONFIG_FSL_BOOKE */
+#endif /* CONFIG_PPC_BOOK3E_MMU */
 #ifdef CONFIG_44x
         mfspr   r0,SPRN_MMUCR
         stw     r0,MMUCR(r11)
@@ -914,7 +914,7 @@ exc_exit_restart_end:
         mtspr   SPRN_##exc_lvl_srr0,r9;                                 \
         mtspr   SPRN_##exc_lvl_srr1,r10;
 
-#if defined(CONFIG_FSL_BOOKE)
+#if defined(CONFIG_PPC_BOOK3E_MMU)
 #ifdef CONFIG_PHYS_64BIT
 #define RESTORE_MAS7                                                    \
         lwz     r11,MAS7(r1);                                           \
@@ -956,7 +956,7 @@ ret_from_crit_exc:
         lwz     r10,crit_srr1@l(r10);
         mtspr   SPRN_SRR0,r9;
         mtspr   SPRN_SRR1,r10;
-        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, RFCI)
+        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, PPC_RFCI)
 #endif /* CONFIG_40x */
 
 #ifdef CONFIG_BOOKE
@@ -967,7 +967,7 @@ ret_from_crit_exc:
         stw     r10,KSP_LIMIT(r9)
         RESTORE_xSRR(SRR0,SRR1);
         RESTORE_MMU_REGS;
-        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, RFCI)
+        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, PPC_RFCI)
 
         .globl  ret_from_debug_exc
 ret_from_debug_exc:
@@ -981,7 +981,7 @@ ret_from_debug_exc:
         RESTORE_xSRR(SRR0,SRR1);
         RESTORE_xSRR(CSRR0,CSRR1);
         RESTORE_MMU_REGS;
-        RET_FROM_EXC_LEVEL(SPRN_DSRR0, SPRN_DSRR1, RFDI)
+        RET_FROM_EXC_LEVEL(SPRN_DSRR0, SPRN_DSRR1, PPC_RFDI)
 
         .globl  ret_from_mcheck_exc
 ret_from_mcheck_exc:
@@ -992,7 +992,7 @@ ret_from_mcheck_exc:
         RESTORE_xSRR(CSRR0,CSRR1);
         RESTORE_xSRR(DSRR0,DSRR1);
         RESTORE_MMU_REGS;
-        RET_FROM_EXC_LEVEL(SPRN_MCSRR0, SPRN_MCSRR1, RFMCI)
+        RET_FROM_EXC_LEVEL(SPRN_MCSRR0, SPRN_MCSRR1, PPC_RFMCI)
 #endif /* CONFIG_BOOKE */
 
 /*
@@ -1176,59 +1176,27 @@ _GLOBAL(_mcount)
         bctr
 
 _GLOBAL(ftrace_caller)
-        /* Based off of objdump optput from glibc */
-        stwu    r1,-48(r1)
-        stw     r3, 12(r1)
-        stw     r4, 16(r1)
-        stw     r5, 20(r1)
-        stw     r6, 24(r1)
-        mflr    r3
-        lwz     r4, 52(r1)
-        mfcr    r5
-        stw     r7, 28(r1)
-        stw     r8, 32(r1)
-        stw     r9, 36(r1)
-        stw     r10,40(r1)
-        stw     r3, 44(r1)
-        stw     r5, 8(r1)
+        MCOUNT_SAVE_FRAME
+        /* r3 ends up with link register */
         subi    r3, r3, MCOUNT_INSN_SIZE
 .globl ftrace_call
 ftrace_call:
         bl      ftrace_stub
         nop
-        lwz     r6, 8(r1)
-        lwz     r0, 44(r1)
-        lwz     r3, 12(r1)
-        mtctr   r0
-        lwz     r4, 16(r1)
-        mtcr    r6
-        lwz     r5, 20(r1)
-        lwz     r6, 24(r1)
-        lwz     r0, 52(r1)
-        lwz     r7, 28(r1)
-        lwz     r8, 32(r1)
-        mtlr    r0
-        lwz     r9, 36(r1)
-        lwz     r10,40(r1)
-        addi    r1, r1, 48
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+.globl ftrace_graph_call
+ftrace_graph_call:
+        b       ftrace_graph_stub
+_GLOBAL(ftrace_graph_stub)
+#endif
+        MCOUNT_RESTORE_FRAME
+        /* old link register ends up in ctr reg */
         bctr
 #else
 _GLOBAL(mcount)
 _GLOBAL(_mcount)
-        stwu    r1,-48(r1)
-        stw     r3, 12(r1)
-        stw     r4, 16(r1)
-        stw     r5, 20(r1)
-        stw     r6, 24(r1)
-        mflr    r3
-        lwz     r4, 52(r1)
-        mfcr    r5
-        stw     r7, 28(r1)
-        stw     r8, 32(r1)
-        stw     r9, 36(r1)
-        stw     r10,40(r1)
-        stw     r3, 44(r1)
-        stw     r5, 8(r1)
+
+        MCOUNT_SAVE_FRAME
 
         subi    r3, r3, MCOUNT_INSN_SIZE
         LOAD_REG_ADDR(r5, ftrace_trace_function)
@@ -1236,28 +1204,55 @@ _GLOBAL(_mcount)
 
         mtctr   r5
         bctrl
-
         nop
 
-        lwz     r6, 8(r1)
-        lwz     r0, 44(r1)
-        lwz     r3, 12(r1)
-        mtctr   r0
-        lwz     r4, 16(r1)
-        mtcr    r6
-        lwz     r5, 20(r1)
-        lwz     r6, 24(r1)
-        lwz     r0, 52(r1)
-        lwz     r7, 28(r1)
-        lwz     r8, 32(r1)
-        mtlr    r0
-        lwz     r9, 36(r1)
-        lwz     r10,40(r1)
-        addi    r1, r1, 48
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+        b       ftrace_graph_caller
+#endif
+        MCOUNT_RESTORE_FRAME
         bctr
 #endif
 
 _GLOBAL(ftrace_stub)
         blr
 
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+_GLOBAL(ftrace_graph_caller)
+        /* load r4 with local address */
+        lwz     r4, 44(r1)
+        subi    r4, r4, MCOUNT_INSN_SIZE
+
+        /* get the parent address */
+        addi    r3, r1, 52
+
+        bl      prepare_ftrace_return
+        nop
+
+        MCOUNT_RESTORE_FRAME
+        /* old link register ends up in ctr reg */
+        bctr
+
+_GLOBAL(return_to_handler)
+        /* need to save return values */
+        stwu    r1, -32(r1)
+        stw     r3, 20(r1)
+        stw     r4, 16(r1)
+        stw     r31, 12(r1)
+        mr      r31, r1
+
+        bl      ftrace_return_to_handler
+        nop
+
+        /* return value has real return address */
+        mtlr    r3
+
+        lwz     r3, 20(r1)
+        lwz     r4, 16(r1)
+        lwz     r31,12(r1)
+        lwz     r1, 0(r1)
+
+        /* Jump back to real return address */
+        blr
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+
 #endif /* CONFIG_MCOUNT */