|
@@ -57,6 +57,12 @@
|
|
|
move ra, AT
|
|
|
.endm
|
|
|
|
|
|
+/*
|
|
|
+ * The -mmcount-ra-address option of gcc 4.5 uses register $12 to pass
|
|
|
+ * the location of the parent's return address.
|
|
|
+ */
|
|
|
+#define MCOUNT_RA_ADDRESS_REG $12
|
|
|
+
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
|
|
|
|
NESTED(ftrace_caller, PT_SIZE, ra)
|
|
@@ -70,7 +76,7 @@ _mcount:
|
|
|
|
|
|
MCOUNT_SAVE_REGS
|
|
|
#ifdef KBUILD_MCOUNT_RA_ADDRESS
|
|
|
- PTR_S t0, PT_R12(sp) /* save location of parent's return address */
|
|
|
+ PTR_S MCOUNT_RA_ADDRESS_REG, PT_R12(sp)
|
|
|
#endif
|
|
|
|
|
|
move a0, ra /* arg1: self return address */
|
|
@@ -142,9 +148,9 @@ NESTED(ftrace_graph_caller, PT_SIZE, ra)
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
|
PTR_L a0, PT_R12(sp)
|
|
|
#else
|
|
|
- move a0, t0
|
|
|
+ move a0, MCOUNT_RA_ADDRESS_REG
|
|
|
#endif
|
|
|
- bnez a0, 1f /* non-leaf func: stored in t0 */
|
|
|
+ bnez a0, 1f /* non-leaf func: stored in MCOUNT_RA_ADDRESS_REG */
|
|
|
nop
|
|
|
#endif
|
|
|
PTR_LA a0, PT_R1(sp) /* leaf func: the location in current stack */
|