2 files changed, 47 insertions, 60 deletions
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index e5f2ae8362f7..dde1296b8b41 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -5,7 +5,44 @@
 #define MCOUNT_ADDR             ((long)(_mcount))
 #define MCOUNT_INSN_SIZE        4 /* sizeof mcount call */
-#ifndef __ASSEMBLY__
+#ifdef __ASSEMBLY__
+/* Based off of objdump optput from glibc */
+#define MCOUNT_SAVE_FRAME                       \
+        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)
+#define MCOUNT_RESTORE_FRAME                    \
+        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
+#else /* !__ASSEMBLY__ */
 extern void _mcount(void);
 #ifdef CONFIG_DYNAMIC_FTRACE
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 301c646d1a7d..fd54cb59728e 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1176,59 +1176,22 @@ _GLOBAL(_mcount)
        bctr
 _GLOBAL(ftrace_caller)
-        /* Based off of objdump optput from glibc */
+        MCOUNT_SAVE_FRAME
-        stwu    r1,-48(r1)
+        /* r3 ends up with link register */
-        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)
        subi    r3, r3, MCOUNT_INSN_SIZE
 .globl ftrace_call
 ftrace_call:
        bl      ftrace_stub
        nop
-        lwz     r6, 8(r1)
-        lwz     r0, 44(r1)
+        MCOUNT_RESTORE_FRAME
-        lwz     r3, 12(r1)
+        /* old link register ends up in ctr reg */
-        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
        bctr
 #else
 _GLOBAL(mcount)
 _GLOBAL(_mcount)
-        stwu    r1,-48(r1)
-        stw     r3, 12(r1)
+        MCOUNT_SAVE_FRAME
-        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)
        subi    r3, r3, MCOUNT_INSN_SIZE
        LOAD_REG_ADDR(r5, ftrace_trace_function)
@@ -1239,21 +1202,8 @@ _GLOBAL(_mcount)
        nop
-        lwz     r6, 8(r1)
+        MCOUNT_RESTORE_FRAME
-        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
        bctr
 #endif

diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h index e5f2ae8362f7..dde1296b8b41 100644 --- a/arch/powerpc/include/asm/ftrace.h +++ b/arch/powerpc/include/asm/ftrace.h
@@ -5,7 +5,44 @@
5	#define MCOUNT_ADDR ((long)(_mcount))	5	#define MCOUNT_ADDR ((long)(_mcount))
6	#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */	6	#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
7		7
8	#ifndef __ASSEMBLY__	8	#ifdef __ASSEMBLY__
		9
		10	/* Based off of objdump optput from glibc */
		11
		12	#define MCOUNT_SAVE_FRAME \
		13	stwu r1,-48(r1); \
		14	stw r3, 12(r1); \
		15	stw r4, 16(r1); \
		16	stw r5, 20(r1); \
		17	stw r6, 24(r1); \
		18	mflr r3; \
		19	lwz r4, 52(r1); \
		20	mfcr r5; \
		21	stw r7, 28(r1); \
		22	stw r8, 32(r1); \
		23	stw r9, 36(r1); \
		24	stw r10,40(r1); \
		25	stw r3, 44(r1); \
		26	stw r5, 8(r1)
		27
		28	#define MCOUNT_RESTORE_FRAME \
		29	lwz r6, 8(r1); \
		30	lwz r0, 44(r1); \
		31	lwz r3, 12(r1); \
		32	mtctr r0; \
		33	lwz r4, 16(r1); \
		34	mtcr r6; \
		35	lwz r5, 20(r1); \
		36	lwz r6, 24(r1); \
		37	lwz r0, 52(r1); \
		38	lwz r7, 28(r1); \
		39	lwz r8, 32(r1); \
		40	mtlr r0; \
		41	lwz r9, 36(r1); \
		42	lwz r10,40(r1); \
		43	addi r1, r1, 48
		44
		45	#else /* !__ASSEMBLY__ */
9	extern void _mcount(void);	46	extern void _mcount(void);
10		47
11	#ifdef CONFIG_DYNAMIC_FTRACE	48	#ifdef CONFIG_DYNAMIC_FTRACE


diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 301c646d1a7d..fd54cb59728e 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S
@@ -1176,59 +1176,22 @@ _GLOBAL(_mcount)
1176	bctr	1176	bctr
1177		1177
1178	_GLOBAL(ftrace_caller)	1178	_GLOBAL(ftrace_caller)
1179	/* Based off of objdump optput from glibc */	1179	MCOUNT_SAVE_FRAME
1180	stwu r1,-48(r1)	1180	/* r3 ends up with link register */
1181	stw r3, 12(r1)
1182	stw r4, 16(r1)
1183	stw r5, 20(r1)
1184	stw r6, 24(r1)
1185	mflr r3
1186	lwz r4, 52(r1)
1187	mfcr r5
1188	stw r7, 28(r1)
1189	stw r8, 32(r1)
1190	stw r9, 36(r1)
1191	stw r10,40(r1)
1192	stw r3, 44(r1)
1193	stw r5, 8(r1)
1194	subi r3, r3, MCOUNT_INSN_SIZE	1181	subi r3, r3, MCOUNT_INSN_SIZE
1195	.globl ftrace_call	1182	.globl ftrace_call
1196	ftrace_call:	1183	ftrace_call:
1197	bl ftrace_stub	1184	bl ftrace_stub
1198	nop	1185	nop
1199	lwz r6, 8(r1)	1186
1200	lwz r0, 44(r1)	1187	MCOUNT_RESTORE_FRAME
1201	lwz r3, 12(r1)	1188	/* old link register ends up in ctr reg */
1202	mtctr r0
1203	lwz r4, 16(r1)
1204	mtcr r6
1205	lwz r5, 20(r1)
1206	lwz r6, 24(r1)
1207	lwz r0, 52(r1)
1208	lwz r7, 28(r1)
1209	lwz r8, 32(r1)
1210	mtlr r0
1211	lwz r9, 36(r1)
1212	lwz r10,40(r1)
1213	addi r1, r1, 48
1214	bctr	1189	bctr
1215	#else	1190	#else
1216	_GLOBAL(mcount)	1191	_GLOBAL(mcount)
1217	_GLOBAL(_mcount)	1192	_GLOBAL(_mcount)
1218	stwu r1,-48(r1)	1193
1219	stw r3, 12(r1)	1194	MCOUNT_SAVE_FRAME
1220	stw r4, 16(r1)
1221	stw r5, 20(r1)
1222	stw r6, 24(r1)
1223	mflr r3
1224	lwz r4, 52(r1)
1225	mfcr r5
1226	stw r7, 28(r1)
1227	stw r8, 32(r1)
1228	stw r9, 36(r1)
1229	stw r10,40(r1)
1230	stw r3, 44(r1)
1231	stw r5, 8(r1)
1232		1195
1233	subi r3, r3, MCOUNT_INSN_SIZE	1196	subi r3, r3, MCOUNT_INSN_SIZE
1234	LOAD_REG_ADDR(r5, ftrace_trace_function)	1197	LOAD_REG_ADDR(r5, ftrace_trace_function)
@@ -1239,21 +1202,8 @@ _GLOBAL(_mcount)
1239		1202
1240	nop	1203	nop
1241		1204
1242	lwz r6, 8(r1)	1205	MCOUNT_RESTORE_FRAME
1243	lwz r0, 44(r1)	1206
1244	lwz r3, 12(r1)
1245	mtctr r0
1246	lwz r4, 16(r1)
1247	mtcr r6
1248	lwz r5, 20(r1)
1249	lwz r6, 24(r1)
1250	lwz r0, 52(r1)
1251	lwz r7, 28(r1)
1252	lwz r8, 32(r1)
1253	mtlr r0
1254	lwz r9, 36(r1)
1255	lwz r10,40(r1)
1256	addi r1, r1, 48
1257	bctr	1207	bctr
1258	#endif	1208	#endif
1259		1209