From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 4 Dec 2007 19:02:18 +0000 (-0600)
Subject: [POWERPC] 4xx: Fix 440grx setup function to call 440A fixup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ac30c314529af21ae739375d25c7da78887363b;p=deliverable%2Flinux.git

[POWERPC] 4xx: Fix 440grx setup function to call 440A fixup

The mechanism to do the setup for 440A cores changed recently.  This fixes
the 440grx setup function to call __fixup_440A_mcheck.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---

diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 0de3edbd4bb8..6250443ab9c9 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -27,7 +27,11 @@ _GLOBAL(__setup_cpu_440epx)
 	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