summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/cpu_setup_44x.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 11:59:39 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 11:59:39 +0100
commitfd10902797fc9d6abaf55d9c2e3c6698c90b10c7 (patch)
tree0bc15b8b967e6f0973387e7c81f5b0dc9ce44e75 /arch/powerpc/kernel/cpu_setup_44x.S
parent5b3eec0c80038c8739ccd465b897a35c0dff1cc4 (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
downloadtalos-obmc-linux-fd10902797fc9d6abaf55d9c2e3c6698c90b10c7.tar.gz
talos-obmc-linux-fd10902797fc9d6abaf55d9c2e3c6698c90b10c7.zip
Merge commit 'v2.6.28-rc8' into x86/irq
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_44x.S')
-rw-r--r--arch/powerpc/kernel/cpu_setup_44x.S8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 80cac984d85d..10b4ab1008af 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -34,7 +34,13 @@ _GLOBAL(__setup_cpu_440grx)
blr
_GLOBAL(__setup_cpu_460ex)
_GLOBAL(__setup_cpu_460gt)
- b __init_fpu_44x
+ mflr r4
+ bl __init_fpu_44x
+ bl __fixup_440A_mcheck
+ mtlr r4
+ blr
+
+_GLOBAL(__setup_cpu_440x5)
_GLOBAL(__setup_cpu_440gx)
_GLOBAL(__setup_cpu_440spe)
b __fixup_440A_mcheck
OpenPOWER on IntegriCloud