Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / kernel / entry_32.S

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 22b45a4..10a0935 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1424,12 +1424,18 @@ _GLOBAL(ftrace_graph_caller)
        lwz     r4, 44(r1)
        subi    r4, r4, MCOUNT_INSN_SIZE
 
-       /* get the parent address */
-       addi    r3, r1, 52
+       /* Grab the LR out of the caller stack frame */
+       lwz     r3,52(r1)
 
        bl      prepare_ftrace_return
        nop
 
+        /*
+         * prepare_ftrace_return gives us the address we divert to.
+         * Change the LR in the callers stack frame to this.
+         */
+       stw     r3,52(r1)
+
        MCOUNT_RESTORE_FRAME
        /* old link register ends up in ctr reg */
        bctr
@@ -1457,4 +1463,4 @@ _GLOBAL(return_to_handler)
        blr
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
-#endif /* CONFIG_MCOUNT */
+#endif /* CONFIG_FUNCTION_TRACER */