summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/cpu_setup_44x.S
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-11-11 17:02:43 +0100
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-11-13 16:11:26 +0100
commit6612d9b0b8208c2ade3a16b8302a271ec81d45f6 (patch)
tree8c5ae9d31853b147fe90ac8df8e48ca215e38061 /arch/powerpc/kernel/cpu_setup_44x.S
parentpowerpc/40x: Limit allocable DRAM during early mapping (diff)
downloadlinux-6612d9b0b8208c2ade3a16b8302a271ec81d45f6.tar.xz
linux-6612d9b0b8208c2ade3a16b8302a271ec81d45f6.zip
powerpc/44x: Fix 460EX/460GT machine check handling
Those cores use the 440A type machine check (ie, they have MCSRR0/MCSRR1). They thus need to call the appropriate fixup function to hook the right variant of the exception. Without this, all machine checks become fatal due to loss of context when entering the exception handler. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_44x.S')
-rw-r--r--arch/powerpc/kernel/cpu_setup_44x.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 80cac984d85d..31c18b52affb 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -34,7 +34,12 @@ _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_440gx)
_GLOBAL(__setup_cpu_440spe)
b __fixup_440A_mcheck