1 files changed, 14 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 8e1812e2f3ee..6250443ab9c9 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -23,11 +23,24 @@ _GLOBAL(__setup_cpu_440epx)
        mflr    r4
        bl      __init_fpu_44x
        bl      __plb_disable_wrp
+        bl      __fixup_440A_mcheck
        mtlr    r4
        blr
 _GLOBAL(__setup_cpu_440grx)
-        b       __plb_disable_wrp
+        mflr    r4
+        bl      __plb_disable_wrp
+        bl      __fixup_440A_mcheck
+        mtlr    r4
+        blr
+_GLOBAL(__setup_cpu_440gx)
+_GLOBAL(__setup_cpu_440spe)
+        b       __fixup_440A_mcheck
+ /* Temporary fixup for arch/ppc until we kill the whole thing */
+#ifndef CONFIG_PPC_MERGE
+_GLOBAL(__fixup_440A_mcheck)
+        blr
+#endif
 /* enable APU between CPU and FPU */
 _GLOBAL(__init_fpu_44x)

diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 8e1812e2f3ee..6250443ab9c9 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -23,11 +23,24 @@ _GLOBAL(__setup_cpu_440epx)
23	mflr r4	23	mflr r4
24	bl __init_fpu_44x	24	bl __init_fpu_44x
25	bl __plb_disable_wrp	25	bl __plb_disable_wrp
		26	bl __fixup_440A_mcheck
26	mtlr r4	27	mtlr r4
27	blr	28	blr
28	_GLOBAL(__setup_cpu_440grx)	29	_GLOBAL(__setup_cpu_440grx)
29	b __plb_disable_wrp	30	mflr r4
		31	bl __plb_disable_wrp
		32	bl __fixup_440A_mcheck
		33	mtlr r4
		34	blr
		35	_GLOBAL(__setup_cpu_440gx)
		36	_GLOBAL(__setup_cpu_440spe)
		37	b __fixup_440A_mcheck
30		38
		39	/* Temporary fixup for arch/ppc until we kill the whole thing */
		40	#ifndef CONFIG_PPC_MERGE
		41	_GLOBAL(__fixup_440A_mcheck)
		42	blr
		43	#endif
31		44
32	/* enable APU between CPU and FPU */	45	/* enable APU between CPU and FPU */
33	_GLOBAL(__init_fpu_44x)	46	_GLOBAL(__init_fpu_44x)