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>

1 files changed, 21 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index cb1a3a54a026..de0978742221 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -203,7 +203,7 @@ i##n:								\
                           ret_from_except)
 
 /* System reset */
-        EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD)
+        EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
 
 /* Machine check */
         . = 0x200
@@ -214,7 +214,7 @@ MachineCheck:
         mfspr r5,SPRN_DSISR
         stw r5,_DSISR(r11)
         addi r3,r1,STACK_FRAME_OVERHEAD
-        EXC_XFER_STD(0x200, MachineCheckException)
+        EXC_XFER_STD(0x200, machine_check_exception)
 
 /* Data access exception.
  * This is "never generated" by the MPC8xx.  We jump to it for other
@@ -252,20 +252,20 @@ Alignment:
         mfspr   r5,SPRN_DSISR
         stw     r5,_DSISR(r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        EXC_XFER_EE(0x600, AlignmentException)
+        EXC_XFER_EE(0x600, alignment_exception)
 
 /* Program check exception */
-        EXCEPTION(0x700, ProgramCheck, ProgramCheckException, EXC_XFER_STD)
+        EXCEPTION(0x700, ProgramCheck, program_check_exception, EXC_XFER_STD)
 
 /* No FPU on MPC8xx.  This exception is not supposed to happen.
 */
-        EXCEPTION(0x800, FPUnavailable, UnknownException, EXC_XFER_STD)
+        EXCEPTION(0x800, FPUnavailable, unknown_exception, EXC_XFER_STD)
 
 /* Decrementer */
         EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
 
-        EXCEPTION(0xa00, Trap_0a, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0xb00, Trap_0b, UnknownException, EXC_XFER_EE)
+        EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
 
 /* System call */
         . = 0xc00
@@ -274,9 +274,9 @@ SystemCall:
         EXC_XFER_EE_LITE(0xc00, DoSyscall)
 
 /* Single step - not used on 601 */
-        EXCEPTION(0xd00, SingleStep, SingleStepException, EXC_XFER_STD)
-        EXCEPTION(0xe00, Trap_0e, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0xf00, Trap_0f, UnknownException, EXC_XFER_EE)
+        EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
+        EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0xf00, Trap_0f, unknown_exception, EXC_XFER_EE)
 
 /* On the MPC8xx, this is a software emulation interrupt.  It occurs
  * for all unimplemented and illegal instructions.
@@ -540,22 +540,22 @@ DataTLBError:
 #endif
         b       DataAccess
 
-        EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1700, Trap_17, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1a00, Trap_1a, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1b00, Trap_1b, UnknownException, EXC_XFER_EE)
+        EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
 
 /* On the MPC8xx, these next four traps are used for development
  * support of breakpoints and such.  Someday I will get around to
  * using them.
  */
-        EXCEPTION(0x1c00, Trap_1c, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1d00, Trap_1d, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1e00, Trap_1e, UnknownException, EXC_XFER_EE)
-        EXCEPTION(0x1f00, Trap_1f, UnknownException, EXC_XFER_EE)
+        EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
+        EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
 
         . = 0x2000