summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/ibm44x_common.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-01 18:43:42 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-01 18:43:42 +1000
commitdc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0 (patch)
treefa088ac3eae8709dd379deda6f31d5b29197d4c9 /arch/ppc/syslib/ibm44x_common.c
parentd96024c688b59d4d1e60dbb0e226964eb758aa01 (diff)
downloadop-kernel-dev-dc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0.zip
op-kernel-dev-dc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0.tar.gz
powerpc: merge idle_power4.S and trapc.s
Use idle_power4.S from ppc64 as we are not going to support 32 bit power4 in the merged tree. Merge ppc64 traps.c into powerpc traps.c: use ppc64 versions of exception routine names (as they don't have StudlyCaps) make all the versions if die() have the same prototype Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc/syslib/ibm44x_common.c')
-rw-r--r--arch/ppc/syslib/ibm44x_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c
index 7612e06..95e11f9 100644
--- a/arch/ppc/syslib/ibm44x_common.c
+++ b/arch/ppc/syslib/ibm44x_common.c
@@ -178,7 +178,7 @@ void __init ibm44x_platform_init(void)
#endif
}
-/* Called from MachineCheckException */
+/* Called from machine_check_exception */
void platform_machine_check(struct pt_regs *regs)
{
printk("PLB0: BEAR=0x%08x%08x ACR= 0x%08x BESR= 0x%08x\n",
OpenPOWER on IntegriCloud