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>
This commit is contained in:
@@ -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",
|
||||
|
Reference in New Issue
Block a user