Skip to content

L
linux-davinci
Commit dc1c1ca3 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent d96024c6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 564 additions and 922 deletions
arch/powerpc/Kconfig
View file @ dc1c1ca3
...@@ -142,8 +142,8 @@ config POWER4 ...@@ -142,8 +142,8 @@ config POWER4
def_bool y def_bool y
config PPC_FPU config PPC_FPU
bool depends on PPC32
default y if PPC64 def_bool y
config BOOKE config BOOKE
bool bool
......
arch/powerpc/kernel/head.S
View file @ dc1c1ca3
...@@ -349,12 +349,12 @@ i##n: \ ...@@ -349,12 +349,12 @@ i##n: \
/* System reset */ /* System reset */
/* core99 pmac starts the seconary here by changing the vector, and /* core99 pmac starts the seconary here by changing the vector, and
putting it back to what it was (UnknownException) when done. */ putting it back to what it was (unknown_exception) when done. */
#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP) #if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
. = 0x100 . = 0x100
b __secondary_start_gemini b __secondary_start_gemini
#else #else
EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD) EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
#endif #endif
/* Machine check */ /* Machine check */
...@@ -389,7 +389,7 @@ i##n: \ ...@@ -389,7 +389,7 @@ i##n: \
cmpwi cr1,r4,0 cmpwi cr1,r4,0
bne cr1,1f bne cr1,1f
#endif #endif
EXC_XFER_STD(0x200, MachineCheckException) EXC_XFER_STD(0x200, machine_check_exception)
#ifdef CONFIG_PPC_CHRP #ifdef CONFIG_PPC_CHRP
1: b machine_check_in_rtas 1: b machine_check_in_rtas
#endif #endif
...@@ -456,10 +456,10 @@ Alignment: ...@@ -456,10 +456,10 @@ Alignment:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* Program check exception */ /* Program check exception */
EXCEPTION(0x700, ProgramCheck, ProgramCheckException, EXC_XFER_STD) EXCEPTION(0x700, ProgramCheck, program_check_exception, EXC_XFER_STD)
/* Floating-point unavailable */ /* Floating-point unavailable */
. = 0x800 . = 0x800
...@@ -472,8 +472,8 @@ FPUnavailable: ...@@ -472,8 +472,8 @@ FPUnavailable:
/* Decrementer */ /* Decrementer */
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE) EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
EXCEPTION(0xa00, Trap_0a, UnknownException, EXC_XFER_EE) EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xb00, Trap_0b, UnknownException, EXC_XFER_EE) EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
/* System call */ /* System call */
. = 0xc00 . = 0xc00
...@@ -482,8 +482,8 @@ SystemCall: ...@@ -482,8 +482,8 @@ SystemCall:
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
/* Single step - not used on 601 */ /* Single step - not used on 601 */
EXCEPTION(0xd00, SingleStep, SingleStepException, EXC_XFER_STD) EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
EXCEPTION(0xe00, Trap_0e, UnknownException, EXC_XFER_EE) EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_EE)
/* /*
* The Altivec unavailable trap is at 0x0f20. Foo. * The Altivec unavailable trap is at 0x0f20. Foo.
...@@ -502,7 +502,7 @@ SystemCall: ...@@ -502,7 +502,7 @@ SystemCall:
Trap_0f: Trap_0f:
EXCEPTION_PROLOG EXCEPTION_PROLOG
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0xf00, UnknownException) EXC_XFER_EE(0xf00, unknown_exception)
/* /*
* Handle TLB miss for instruction on 603/603e. * Handle TLB miss for instruction on 603/603e.
...@@ -702,44 +702,44 @@ DataStoreTLBMiss: ...@@ -702,44 +702,44 @@ DataStoreTLBMiss:
rfi rfi
#ifndef CONFIG_ALTIVEC #ifndef CONFIG_ALTIVEC
#define AltivecAssistException UnknownException #define altivec_assist_exception unknown_exception
#endif #endif
EXCEPTION(0x1300, Trap_13, InstructionBreakpoint, EXC_XFER_EE) EXCEPTION(0x1300, Trap_13, instruction_breakpoint_exception, EXC_XFER_EE)
EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE) EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE)
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
#ifdef CONFIG_POWER4 #ifdef CONFIG_POWER4
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, AltivecAssistException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, altivec_assist_exception, EXC_XFER_EE)
EXCEPTION(0x1800, Trap_18, TAUException, EXC_XFER_STD) EXCEPTION(0x1800, Trap_18, TAUException, EXC_XFER_STD)
#else /* !CONFIG_POWER4 */ #else /* !CONFIG_POWER4 */
EXCEPTION(0x1600, Trap_16, AltivecAssistException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, altivec_assist_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD) EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD)
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_POWER4 */
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1a00, Trap_1a, UnknownException, EXC_XFER_EE) EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1b00, Trap_1b, UnknownException, EXC_XFER_EE) EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1c00, Trap_1c, UnknownException, EXC_XFER_EE) EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1d00, Trap_1d, UnknownException, EXC_XFER_EE) EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1e00, Trap_1e, UnknownException, EXC_XFER_EE) EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1f00, Trap_1f, UnknownException, EXC_XFER_EE) EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2000, RunMode, RunModeException, EXC_XFER_EE) EXCEPTION(0x2000, RunMode, RunModeException, EXC_XFER_EE)
EXCEPTION(0x2100, Trap_21, UnknownException, EXC_XFER_EE) EXCEPTION(0x2100, Trap_21, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2200, Trap_22, UnknownException, EXC_XFER_EE) EXCEPTION(0x2200, Trap_22, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2300, Trap_23, UnknownException, EXC_XFER_EE) EXCEPTION(0x2300, Trap_23, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2400, Trap_24, UnknownException, EXC_XFER_EE) EXCEPTION(0x2400, Trap_24, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2500, Trap_25, UnknownException, EXC_XFER_EE) EXCEPTION(0x2500, Trap_25, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2600, Trap_26, UnknownException, EXC_XFER_EE) EXCEPTION(0x2600, Trap_26, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2700, Trap_27, UnknownException, EXC_XFER_EE) EXCEPTION(0x2700, Trap_27, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2800, Trap_28, UnknownException, EXC_XFER_EE) EXCEPTION(0x2800, Trap_28, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2900, Trap_29, UnknownException, EXC_XFER_EE) EXCEPTION(0x2900, Trap_29, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2a00, Trap_2a, UnknownException, EXC_XFER_EE) EXCEPTION(0x2a00, Trap_2a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2b00, Trap_2b, UnknownException, EXC_XFER_EE) EXCEPTION(0x2b00, Trap_2b, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2c00, Trap_2c, UnknownException, EXC_XFER_EE) EXCEPTION(0x2c00, Trap_2c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2d00, Trap_2d, UnknownException, EXC_XFER_EE) EXCEPTION(0x2d00, Trap_2d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2e00, Trap_2e, UnknownException, EXC_XFER_EE) EXCEPTION(0x2e00, Trap_2e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2f00, MOLTrampoline, UnknownException, EXC_XFER_EE_LITE) EXCEPTION(0x2f00, MOLTrampoline, unknown_exception, EXC_XFER_EE_LITE)
.globl mol_trampoline .globl mol_trampoline
.set mol_trampoline, i0x2f00 .set mol_trampoline, i0x2f00
...@@ -751,7 +751,7 @@ AltiVecUnavailable: ...@@ -751,7 +751,7 @@ AltiVecUnavailable:
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
bne load_up_altivec /* if from user, just load it up */ bne load_up_altivec /* if from user, just load it up */
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
EXC_XFER_EE_LITE(0xf20, AltivecUnavailException) EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception)
#ifdef CONFIG_PPC64BRIDGE #ifdef CONFIG_PPC64BRIDGE
DataAccess: DataAccess:
...@@ -767,12 +767,12 @@ DataSegment: ...@@ -767,12 +767,12 @@ DataSegment:
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
mfspr r4,SPRN_DAR mfspr r4,SPRN_DAR
stw r4,_DAR(r11) stw r4,_DAR(r11)
EXC_XFER_STD(0x380, UnknownException) EXC_XFER_STD(0x380, unknown_exception)
InstructionSegment: InstructionSegment:
EXCEPTION_PROLOG EXCEPTION_PROLOG
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x480, UnknownException) EXC_XFER_STD(0x480, unknown_exception)
#endif /* CONFIG_PPC64BRIDGE */ #endif /* CONFIG_PPC64BRIDGE */
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
......
arch/powerpc/kernel/head_44x.S
View file @ dc1c1ca3
...@@ -309,13 +309,13 @@ skpinv: addi r4,r4,1 /* Increment */ ...@@ -309,13 +309,13 @@ skpinv: addi r4,r4,1 /* Increment */
interrupt_base: interrupt_base:
/* Critical Input Interrupt */ /* Critical Input Interrupt */
CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
/* Machine Check Interrupt */ /* Machine Check Interrupt */
#ifdef CONFIG_440A #ifdef CONFIG_440A
MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException) MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#else #else
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#endif #endif
/* Data Storage Interrupt */ /* Data Storage Interrupt */
...@@ -442,7 +442,7 @@ interrupt_base: ...@@ -442,7 +442,7 @@ interrupt_base:
#ifdef CONFIG_PPC_FPU #ifdef CONFIG_PPC_FPU
FP_UNAVAILABLE_EXCEPTION FP_UNAVAILABLE_EXCEPTION
#else #else
EXCEPTION(0x2010, FloatingPointUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2010, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
#endif #endif
/* System Call Interrupt */ /* System Call Interrupt */
...@@ -451,21 +451,21 @@ interrupt_base: ...@@ -451,21 +451,21 @@ interrupt_base:
EXC_XFER_EE_LITE(0x0c00, DoSyscall) EXC_XFER_EE_LITE(0x0c00, DoSyscall)
/* Auxillary Processor Unavailable Interrupt */ /* Auxillary Processor Unavailable Interrupt */
EXCEPTION(0x2020, AuxillaryProcessorUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
/* Decrementer Interrupt */ /* Decrementer Interrupt */
DECREMENTER_EXCEPTION DECREMENTER_EXCEPTION
/* Fixed Internal Timer Interrupt */ /* Fixed Internal Timer Interrupt */
/* TODO: Add FIT support */ /* TODO: Add FIT support */
EXCEPTION(0x1010, FixedIntervalTimer, UnknownException, EXC_XFER_EE) EXCEPTION(0x1010, FixedIntervalTimer, unknown_exception, EXC_XFER_EE)
/* Watchdog Timer Interrupt */ /* Watchdog Timer Interrupt */
/* TODO: Add watchdog support */ /* TODO: Add watchdog support */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException) CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x1020, WatchdogTimer, UnknownException) CRITICAL_EXCEPTION(0x1020, WatchdogTimer, unknown_exception)
#endif #endif
/* Data TLB Error Interrupt */ /* Data TLB Error Interrupt */
......
arch/powerpc/kernel/head_4xx.S
View file @ dc1c1ca3
...@@ -245,12 +245,12 @@ label: ...@@ -245,12 +245,12 @@ label:
/* /*
* 0x0100 - Critical Interrupt Exception * 0x0100 - Critical Interrupt Exception
*/ */
CRITICAL_EXCEPTION(0x0100, CriticalInterrupt, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInterrupt, unknown_exception)
/* /*
* 0x0200 - Machine Check Exception * 0x0200 - Machine Check Exception
*/ */
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
/* /*
* 0x0300 - Data Storage Exception * 0x0300 - Data Storage Exception
...@@ -405,7 +405,7 @@ label: ...@@ -405,7 +405,7 @@ label:
mfspr r4,SPRN_DEAR /* Grab the DEAR and save it */ mfspr r4,SPRN_DEAR /* Grab the DEAR and save it */
stw r4,_DEAR(r11) stw r4,_DEAR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* 0x0700 - Program Exception */ /* 0x0700 - Program Exception */
START_EXCEPTION(0x0700, ProgramCheck) START_EXCEPTION(0x0700, ProgramCheck)
...@@ -413,21 +413,21 @@ label: ...@@ -413,21 +413,21 @@ label:
mfspr r4,SPRN_ESR /* Grab the ESR and save it */ mfspr r4,SPRN_ESR /* Grab the ESR and save it */
stw r4,_ESR(r11) stw r4,_ESR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x700, ProgramCheckException) EXC_XFER_STD(0x700, program_check_exception)
EXCEPTION(0x0800, Trap_08, UnknownException, EXC_XFER_EE) EXCEPTION(0x0800, Trap_08, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0900, Trap_09, UnknownException, EXC_XFER_EE) EXCEPTION(0x0900, Trap_09, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0A00, Trap_0A, UnknownException, EXC_XFER_EE) EXCEPTION(0x0A00, Trap_0A, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0B00, Trap_0B, UnknownException, EXC_XFER_EE) EXCEPTION(0x0B00, Trap_0B, unknown_exception, EXC_XFER_EE)
/* 0x0C00 - System Call Exception */ /* 0x0C00 - System Call Exception */
START_EXCEPTION(0x0C00, SystemCall) START_EXCEPTION(0x0C00, SystemCall)
NORMAL_EXCEPTION_PROLOG NORMAL_EXCEPTION_PROLOG
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
EXCEPTION(0x0D00, Trap_0D, UnknownException, EXC_XFER_EE) EXCEPTION(0x0D00, Trap_0D, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0E00, Trap_0E, UnknownException, EXC_XFER_EE) EXCEPTION(0x0E00, Trap_0E, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0F00, Trap_0F, UnknownException, EXC_XFER_EE) EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_EE)
/* 0x1000 - Programmable Interval Timer (PIT) Exception */ /* 0x1000 - Programmable Interval Timer (PIT) Exception */
START_EXCEPTION(0x1000, Decrementer) START_EXCEPTION(0x1000, Decrementer)
...@@ -444,14 +444,14 @@ label: ...@@ -444,14 +444,14 @@ label:
/* 0x1010 - Fixed Interval Timer (FIT) Exception /* 0x1010 - Fixed Interval Timer (FIT) Exception
*/ */
STND_EXCEPTION(0x1010, FITException, UnknownException) STND_EXCEPTION(0x1010, FITException, unknown_exception)
/* 0x1020 - Watchdog Timer (WDT) Exception /* 0x1020 - Watchdog Timer (WDT) Exception
*/ */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x1020, WDTException, WatchdogException) CRITICAL_EXCEPTION(0x1020, WDTException, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x1020, WDTException, UnknownException) CRITICAL_EXCEPTION(0x1020, WDTException, unknown_exception)
#endif #endif
#endif #endif
...@@ -656,25 +656,25 @@ label: ...@@ -656,25 +656,25 @@ label:
mfspr r10, SPRN_SPRG0 mfspr r10, SPRN_SPRG0
b InstructionAccess b InstructionAccess
EXCEPTION(0x1300, Trap_13, UnknownException, EXC_XFER_EE) EXCEPTION(0x1300, Trap_13, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1400, Trap_14, UnknownException, EXC_XFER_EE) EXCEPTION(0x1400, Trap_14, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
#ifdef CONFIG_IBM405_ERR51 #ifdef CONFIG_IBM405_ERR51
/* 405GP errata 51 */ /* 405GP errata 51 */
START_EXCEPTION(0x1700, Trap_17) START_EXCEPTION(0x1700, Trap_17)
b DTLBMiss b DTLBMiss
#else #else
EXCEPTION(0x1700, Trap_17, UnknownException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_EE)
#endif #endif
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1A00, Trap_1A, UnknownException, EXC_XFER_EE) EXCEPTION(0x1A00, Trap_1A, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1B00, Trap_1B, UnknownException, EXC_XFER_EE) EXCEPTION(0x1B00, Trap_1B, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1C00, Trap_1C, UnknownException, EXC_XFER_EE) EXCEPTION(0x1C00, Trap_1C, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1D00, Trap_1D, UnknownException, EXC_XFER_EE) EXCEPTION(0x1D00, Trap_1D, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1E00, Trap_1E, UnknownException, EXC_XFER_EE) EXCEPTION(0x1E00, Trap_1E, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1F00, Trap_1F, UnknownException, EXC_XFER_EE) EXCEPTION(0x1F00, Trap_1F, unknown_exception, EXC_XFER_EE)
/* Check for a single step debug exception while in an exception /* Check for a single step debug exception while in an exception
* handler before state has been saved. This is to catch the case * handler before state has been saved. This is to catch the case
......
arch/powerpc/kernel/head_8xx.S
View file @ dc1c1ca3
...@@ -203,7 +203,7 @@ i##n: \ ...@@ -203,7 +203,7 @@ i##n: \
ret_from_except) ret_from_except)
/* System reset */ /* System reset */
EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD) EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
/* Machine check */ /* Machine check */
. = 0x200 . = 0x200
...@@ -214,7 +214,7 @@ MachineCheck: ...@@ -214,7 +214,7 @@ MachineCheck:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x200, MachineCheckException) EXC_XFER_STD(0x200, machine_check_exception)
/* Data access exception. /* Data access exception.
* This is "never generated" by the MPC8xx. We jump to it for other * This is "never generated" by the MPC8xx. We jump to it for other
...@@ -252,20 +252,20 @@ Alignment: ...@@ -252,20 +252,20 @@ Alignment:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* Program check 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. /* 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 */ /* Decrementer */
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE) EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
EXCEPTION(0xa00, Trap_0a, UnknownException, EXC_XFER_EE) EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xb00, Trap_0b, UnknownException, EXC_XFER_EE) EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
/* System call */ /* System call */
. = 0xc00 . = 0xc00
...@@ -274,9 +274,9 @@ SystemCall: ...@@ -274,9 +274,9 @@ SystemCall:
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
/* Single step - not used on 601 */ /* Single step - not used on 601 */
EXCEPTION(0xd00, SingleStep, SingleStepException, EXC_XFER_STD) EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
EXCEPTION(0xe00, Trap_0e, UnknownException, EXC_XFER_EE) EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xf00, Trap_0f, UnknownException, EXC_XFER_EE) EXCEPTION(0xf00, Trap_0f, unknown_exception, EXC_XFER_EE)
/* On the MPC8xx, this is a software emulation interrupt. It occurs /* On the MPC8xx, this is a software emulation interrupt. It occurs
* for all unimplemented and illegal instructions. * for all unimplemented and illegal instructions.
...@@ -540,22 +540,22 @@ DataTLBError: ...@@ -540,22 +540,22 @@ DataTLBError:
#endif #endif
b DataAccess b DataAccess
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, UnknownException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1a00, Trap_1a, UnknownException, EXC_XFER_EE) EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1b00, Trap_1b, UnknownException, EXC_XFER_EE) EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
/* On the MPC8xx, these next four traps are used for development /* On the MPC8xx, these next four traps are used for development
* support of breakpoints and such. Someday I will get around to * support of breakpoints and such. Someday I will get around to
* using them. * using them.
*/ */
EXCEPTION(0x1c00, Trap_1c, UnknownException, EXC_XFER_EE) EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1d00, Trap_1d, UnknownException, EXC_XFER_EE) EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1e00, Trap_1e, UnknownException, EXC_XFER_EE) EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1f00, Trap_1f, UnknownException, EXC_XFER_EE) EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
. = 0x2000 . = 0x2000
......
arch/powerpc/kernel/head_fsl_booke.S
View file @ dc1c1ca3
...@@ -426,14 +426,14 @@ skpinv: addi r6,r6,1 /* Increment */ ...@@ -426,14 +426,14 @@ skpinv: addi r6,r6,1 /* Increment */
interrupt_base: interrupt_base:
/* Critical Input Interrupt */ /* Critical Input Interrupt */
CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
/* Machine Check Interrupt */ /* Machine Check Interrupt */
#ifdef CONFIG_E200 #ifdef CONFIG_E200
/* no RFMCI, MCSRRs on E200 */ /* no RFMCI, MCSRRs on E200 */
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#else #else
MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException) MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#endif #endif
/* Data Storage Interrupt */ /* Data Storage Interrupt */
...@@ -542,9 +542,9 @@ interrupt_base: ...@@ -542,9 +542,9 @@ interrupt_base:
#else #else
#ifdef CONFIG_E200 #ifdef CONFIG_E200
/* E200 treats 'normal' floating point instructions as FP Unavail exception */ /* E200 treats 'normal' floating point instructions as FP Unavail exception */
EXCEPTION(0x0800, FloatingPointUnavailable, ProgramCheckException, EXC_XFER_EE) EXCEPTION(0x0800, FloatingPointUnavailable, program_check_exception, EXC_XFER_EE)
#else #else
EXCEPTION(0x0800, FloatingPointUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x0800, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
#endif #endif
#endif #endif
...@@ -554,20 +554,20 @@ interrupt_base: ...@@ -554,20 +554,20 @@ interrupt_base:
EXC_XFER_EE_LITE(0x0c00, DoSyscall) EXC_XFER_EE_LITE(0x0c00, DoSyscall)
/* Auxillary Processor Unavailable Interrupt */ /* Auxillary Processor Unavailable Interrupt */
EXCEPTION(0x2900, AuxillaryProcessorUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2900, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
/* Decrementer Interrupt */ /* Decrementer Interrupt */
DECREMENTER_EXCEPTION DECREMENTER_EXCEPTION
/* Fixed Internal Timer Interrupt */ /* Fixed Internal Timer Interrupt */
/* TODO: Add FIT support */ /* TODO: Add FIT support */
EXCEPTION(0x3100, FixedIntervalTimer, UnknownException, EXC_XFER_EE) EXCEPTION(0x3100, FixedIntervalTimer, unknown_exception, EXC_XFER_EE)
/* Watchdog Timer Interrupt */ /* Watchdog Timer Interrupt */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x3200, WatchdogTimer, WatchdogException) CRITICAL_EXCEPTION(0x3200, WatchdogTimer, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x3200, WatchdogTimer, UnknownException) CRITICAL_EXCEPTION(0x3200, WatchdogTimer, unknown_exception)
#endif #endif
/* Data TLB Error Interrupt */ /* Data TLB Error Interrupt */
...@@ -696,21 +696,21 @@ interrupt_base: ...@@ -696,21 +696,21 @@ interrupt_base:
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE_LITE(0x2010, KernelSPE) EXC_XFER_EE_LITE(0x2010, KernelSPE)
#else #else
EXCEPTION(0x2020, SPEUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2020, SPEUnavailable, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_SPE */ #endif /* CONFIG_SPE */
/* SPE Floating Point Data */ /* SPE Floating Point Data */
#ifdef CONFIG_SPE #ifdef CONFIG_SPE
EXCEPTION(0x2030, SPEFloatingPointData, SPEFloatingPointException, EXC_XFER_EE); EXCEPTION(0x2030, SPEFloatingPointData, SPEFloatingPointException, EXC_XFER_EE);
#else #else
EXCEPTION(0x2040, SPEFloatingPointData, UnknownException, EXC_XFER_EE) EXCEPTION(0x2040, SPEFloatingPointData, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_SPE */ #endif /* CONFIG_SPE */
/* SPE Floating Point Round */ /* SPE Floating Point Round */
EXCEPTION(0x2050, SPEFloatingPointRound, UnknownException, EXC_XFER_EE) EXCEPTION(0x2050, SPEFloatingPointRound, unknown_exception, EXC_XFER_EE)
/* Performance Monitor */ /* Performance Monitor */
EXCEPTION(0x2060, PerformanceMonitor, PerformanceMonitorException, EXC_XFER_STD) EXCEPTION(0x2060, PerformanceMonitor, performance_monitor_exception, EXC_XFER_STD)
/* Debug Interrupt */ /* Debug Interrupt */
......
arch/ppc64/kernel/idle_power4.S → arch/powerpc/kernel/idle_power4.S
View file @ dc1c1ca3
...@@ -76,4 +76,3 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) ...@@ -76,4 +76,3 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
isync isync
sync sync
blr blr
arch/powerpc/kernel/ppc_ksyms.c
View file @ dc1c1ca3
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
extern void transfer_to_handler(void); extern void transfer_to_handler(void);
extern void do_IRQ(struct pt_regs *regs); extern void do_IRQ(struct pt_regs *regs);
extern void MachineCheckException(struct pt_regs *regs); extern void machine_check_exception(struct pt_regs *regs);
extern void AlignmentException(struct pt_regs *regs); extern void alignment_exception(struct pt_regs *regs);
extern void ProgramCheckException(struct pt_regs *regs); extern void program_check_exception(struct pt_regs *regs);
extern void SingleStepException(struct pt_regs *regs); extern void single_step_exception(struct pt_regs *regs);
extern int do_signal(sigset_t *, struct pt_regs *); extern int do_signal(sigset_t *, struct pt_regs *);
extern int pmac_newworld; extern int pmac_newworld;
extern int sys_sigreturn(struct pt_regs *regs); extern int sys_sigreturn(struct pt_regs *regs);
...@@ -72,10 +72,10 @@ EXPORT_SYMBOL(clear_user_page); ...@@ -72,10 +72,10 @@ EXPORT_SYMBOL(clear_user_page);
EXPORT_SYMBOL(do_signal); EXPORT_SYMBOL(do_signal);
EXPORT_SYMBOL(transfer_to_handler); EXPORT_SYMBOL(transfer_to_handler);
EXPORT_SYMBOL(do_IRQ); EXPORT_SYMBOL(do_IRQ);
EXPORT_SYMBOL(MachineCheckException); EXPORT_SYMBOL(machine_check_exception);
EXPORT_SYMBOL(AlignmentException); EXPORT_SYMBOL(alignment_exception);
EXPORT_SYMBOL(ProgramCheckException); EXPORT_SYMBOL(program_check_exception);
EXPORT_SYMBOL(SingleStepException); EXPORT_SYMBOL(single_step_exception);
EXPORT_SYMBOL(sys_sigreturn); EXPORT_SYMBOL(sys_sigreturn);
EXPORT_SYMBOL(ppc_n_lost_interrupts); EXPORT_SYMBOL(ppc_n_lost_interrupts);
EXPORT_SYMBOL(ppc_lost_interrupts); EXPORT_SYMBOL(ppc_lost_interrupts);
......
arch/powerpc/kernel/traps.c
View file @ dc1c1ca3
This diff is collapsed.
arch/ppc/kernel/head.S
View file @ dc1c1ca3
...@@ -349,12 +349,12 @@ i##n: \ ...@@ -349,12 +349,12 @@ i##n: \
/* System reset */ /* System reset */
/* core99 pmac starts the seconary here by changing the vector, and /* core99 pmac starts the seconary here by changing the vector, and
putting it back to what it was (UnknownException) when done. */ putting it back to what it was (unknown_exception) when done. */
#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP) #if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
. = 0x100 . = 0x100
b __secondary_start_gemini b __secondary_start_gemini
#else #else
EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD) EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
#endif #endif
/* Machine check */ /* Machine check */
...@@ -389,7 +389,7 @@ i##n: \ ...@@ -389,7 +389,7 @@ i##n: \
cmpwi cr1,r4,0 cmpwi cr1,r4,0
bne cr1,1f bne cr1,1f
#endif #endif
EXC_XFER_STD(0x200, MachineCheckException) EXC_XFER_STD(0x200, machine_check_exception)
#ifdef CONFIG_PPC_CHRP #ifdef CONFIG_PPC_CHRP
1: b machine_check_in_rtas 1: b machine_check_in_rtas
#endif #endif
...@@ -456,10 +456,10 @@ Alignment: ...@@ -456,10 +456,10 @@ Alignment:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* Program check exception */ /* Program check exception */
EXCEPTION(0x700, ProgramCheck, ProgramCheckException, EXC_XFER_STD) EXCEPTION(0x700, ProgramCheck, program_check_exception, EXC_XFER_STD)
/* Floating-point unavailable */ /* Floating-point unavailable */
. = 0x800 . = 0x800
...@@ -472,8 +472,8 @@ FPUnavailable: ...@@ -472,8 +472,8 @@ FPUnavailable:
/* Decrementer */ /* Decrementer */
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE) EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
EXCEPTION(0xa00, Trap_0a, UnknownException, EXC_XFER_EE) EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xb00, Trap_0b, UnknownException, EXC_XFER_EE) EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
/* System call */ /* System call */
. = 0xc00 . = 0xc00
...@@ -482,8 +482,8 @@ SystemCall: ...@@ -482,8 +482,8 @@ SystemCall:
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
/* Single step - not used on 601 */ /* Single step - not used on 601 */
EXCEPTION(0xd00, SingleStep, SingleStepException, EXC_XFER_STD) EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
EXCEPTION(0xe00, Trap_0e, UnknownException, EXC_XFER_EE) EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_EE)
/* /*
* The Altivec unavailable trap is at 0x0f20. Foo. * The Altivec unavailable trap is at 0x0f20. Foo.
...@@ -502,7 +502,7 @@ SystemCall: ...@@ -502,7 +502,7 @@ SystemCall:
Trap_0f: Trap_0f:
EXCEPTION_PROLOG EXCEPTION_PROLOG
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0xf00, UnknownException) EXC_XFER_EE(0xf00, unknown_exception)
/* /*
* Handle TLB miss for instruction on 603/603e. * Handle TLB miss for instruction on 603/603e.
...@@ -702,44 +702,44 @@ DataStoreTLBMiss: ...@@ -702,44 +702,44 @@ DataStoreTLBMiss:
rfi rfi
#ifndef CONFIG_ALTIVEC #ifndef CONFIG_ALTIVEC
#define AltivecAssistException UnknownException #define altivec_assist_exception unknown_exception
#endif #endif
EXCEPTION(0x1300, Trap_13, InstructionBreakpoint, EXC_XFER_EE) EXCEPTION(0x1300, Trap_13, instruction_breakpoint_exception, EXC_XFER_EE)
EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE) EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE)
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
#ifdef CONFIG_POWER4 #ifdef CONFIG_POWER4
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, AltivecAssistException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, altivec_assist_exception, EXC_XFER_EE)
EXCEPTION(0x1800, Trap_18, TAUException, EXC_XFER_STD) EXCEPTION(0x1800, Trap_18, TAUException, EXC_XFER_STD)
#else /* !CONFIG_POWER4 */ #else /* !CONFIG_POWER4 */
EXCEPTION(0x1600, Trap_16, AltivecAssistException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, altivec_assist_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD) EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD)
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_POWER4 */
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1a00, Trap_1a, UnknownException, EXC_XFER_EE) EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1b00, Trap_1b, UnknownException, EXC_XFER_EE) EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1c00, Trap_1c, UnknownException, EXC_XFER_EE) EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1d00, Trap_1d, UnknownException, EXC_XFER_EE) EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1e00, Trap_1e, UnknownException, EXC_XFER_EE) EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1f00, Trap_1f, UnknownException, EXC_XFER_EE) EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2000, RunMode, RunModeException, EXC_XFER_EE) EXCEPTION(0x2000, RunMode, RunModeException, EXC_XFER_EE)
EXCEPTION(0x2100, Trap_21, UnknownException, EXC_XFER_EE) EXCEPTION(0x2100, Trap_21, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2200, Trap_22, UnknownException, EXC_XFER_EE) EXCEPTION(0x2200, Trap_22, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2300, Trap_23, UnknownException, EXC_XFER_EE) EXCEPTION(0x2300, Trap_23, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2400, Trap_24, UnknownException, EXC_XFER_EE) EXCEPTION(0x2400, Trap_24, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2500, Trap_25, UnknownException, EXC_XFER_EE) EXCEPTION(0x2500, Trap_25, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2600, Trap_26, UnknownException, EXC_XFER_EE) EXCEPTION(0x2600, Trap_26, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2700, Trap_27, UnknownException, EXC_XFER_EE) EXCEPTION(0x2700, Trap_27, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2800, Trap_28, UnknownException, EXC_XFER_EE) EXCEPTION(0x2800, Trap_28, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2900, Trap_29, UnknownException, EXC_XFER_EE) EXCEPTION(0x2900, Trap_29, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2a00, Trap_2a, UnknownException, EXC_XFER_EE) EXCEPTION(0x2a00, Trap_2a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2b00, Trap_2b, UnknownException, EXC_XFER_EE) EXCEPTION(0x2b00, Trap_2b, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2c00, Trap_2c, UnknownException, EXC_XFER_EE) EXCEPTION(0x2c00, Trap_2c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2d00, Trap_2d, UnknownException, EXC_XFER_EE) EXCEPTION(0x2d00, Trap_2d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2e00, Trap_2e, UnknownException, EXC_XFER_EE) EXCEPTION(0x2e00, Trap_2e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x2f00, MOLTrampoline, UnknownException, EXC_XFER_EE_LITE) EXCEPTION(0x2f00, MOLTrampoline, unknown_exception, EXC_XFER_EE_LITE)
.globl mol_trampoline .globl mol_trampoline
.set mol_trampoline, i0x2f00 .set mol_trampoline, i0x2f00
...@@ -751,7 +751,7 @@ AltiVecUnavailable: ...@@ -751,7 +751,7 @@ AltiVecUnavailable:
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
bne load_up_altivec /* if from user, just load it up */ bne load_up_altivec /* if from user, just load it up */
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
EXC_XFER_EE_LITE(0xf20, AltivecUnavailException) EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception)
#ifdef CONFIG_PPC64BRIDGE #ifdef CONFIG_PPC64BRIDGE
DataAccess: DataAccess:
...@@ -767,12 +767,12 @@ DataSegment: ...@@ -767,12 +767,12 @@ DataSegment:
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
mfspr r4,SPRN_DAR mfspr r4,SPRN_DAR
stw r4,_DAR(r11) stw r4,_DAR(r11)
EXC_XFER_STD(0x380, UnknownException) EXC_XFER_STD(0x380, unknown_exception)
InstructionSegment: InstructionSegment:
EXCEPTION_PROLOG EXCEPTION_PROLOG
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x480, UnknownException) EXC_XFER_STD(0x480, unknown_exception)
#endif /* CONFIG_PPC64BRIDGE */ #endif /* CONFIG_PPC64BRIDGE */
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
......
arch/ppc/kernel/head_44x.S
View file @ dc1c1ca3
...@@ -309,13 +309,13 @@ skpinv: addi r4,r4,1 /* Increment */ ...@@ -309,13 +309,13 @@ skpinv: addi r4,r4,1 /* Increment */
interrupt_base: interrupt_base:
/* Critical Input Interrupt */ /* Critical Input Interrupt */
CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
/* Machine Check Interrupt */ /* Machine Check Interrupt */
#ifdef CONFIG_440A #ifdef CONFIG_440A
MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException) MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#else #else
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#endif #endif
/* Data Storage Interrupt */ /* Data Storage Interrupt */
...@@ -442,7 +442,7 @@ interrupt_base: ...@@ -442,7 +442,7 @@ interrupt_base:
#ifdef CONFIG_PPC_FPU #ifdef CONFIG_PPC_FPU
FP_UNAVAILABLE_EXCEPTION FP_UNAVAILABLE_EXCEPTION
#else #else
EXCEPTION(0x2010, FloatingPointUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2010, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
#endif #endif
/* System Call Interrupt */ /* System Call Interrupt */
...@@ -451,21 +451,21 @@ interrupt_base: ...@@ -451,21 +451,21 @@ interrupt_base:
EXC_XFER_EE_LITE(0x0c00, DoSyscall) EXC_XFER_EE_LITE(0x0c00, DoSyscall)
/* Auxillary Processor Unavailable Interrupt */ /* Auxillary Processor Unavailable Interrupt */
EXCEPTION(0x2020, AuxillaryProcessorUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
/* Decrementer Interrupt */ /* Decrementer Interrupt */
DECREMENTER_EXCEPTION DECREMENTER_EXCEPTION
/* Fixed Internal Timer Interrupt */ /* Fixed Internal Timer Interrupt */
/* TODO: Add FIT support */ /* TODO: Add FIT support */
EXCEPTION(0x1010, FixedIntervalTimer, UnknownException, EXC_XFER_EE) EXCEPTION(0x1010, FixedIntervalTimer, unknown_exception, EXC_XFER_EE)
/* Watchdog Timer Interrupt */ /* Watchdog Timer Interrupt */
/* TODO: Add watchdog support */ /* TODO: Add watchdog support */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException) CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x1020, WatchdogTimer, UnknownException) CRITICAL_EXCEPTION(0x1020, WatchdogTimer, unknown_exception)
#endif #endif
/* Data TLB Error Interrupt */ /* Data TLB Error Interrupt */
......
arch/ppc/kernel/head_4xx.S
View file @ dc1c1ca3
...@@ -245,12 +245,12 @@ label: ...@@ -245,12 +245,12 @@ label:
/* /*
* 0x0100 - Critical Interrupt Exception * 0x0100 - Critical Interrupt Exception
*/ */
CRITICAL_EXCEPTION(0x0100, CriticalInterrupt, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInterrupt, unknown_exception)
/* /*
* 0x0200 - Machine Check Exception * 0x0200 - Machine Check Exception
*/ */
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
/* /*
* 0x0300 - Data Storage Exception * 0x0300 - Data Storage Exception
...@@ -405,7 +405,7 @@ label: ...@@ -405,7 +405,7 @@ label:
mfspr r4,SPRN_DEAR /* Grab the DEAR and save it */ mfspr r4,SPRN_DEAR /* Grab the DEAR and save it */
stw r4,_DEAR(r11) stw r4,_DEAR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* 0x0700 - Program Exception */ /* 0x0700 - Program Exception */
START_EXCEPTION(0x0700, ProgramCheck) START_EXCEPTION(0x0700, ProgramCheck)
...@@ -413,21 +413,21 @@ label: ...@@ -413,21 +413,21 @@ label:
mfspr r4,SPRN_ESR /* Grab the ESR and save it */ mfspr r4,SPRN_ESR /* Grab the ESR and save it */
stw r4,_ESR(r11) stw r4,_ESR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x700, ProgramCheckException) EXC_XFER_STD(0x700, program_check_exception)
EXCEPTION(0x0800, Trap_08, UnknownException, EXC_XFER_EE) EXCEPTION(0x0800, Trap_08, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0900, Trap_09, UnknownException, EXC_XFER_EE) EXCEPTION(0x0900, Trap_09, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0A00, Trap_0A, UnknownException, EXC_XFER_EE) EXCEPTION(0x0A00, Trap_0A, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0B00, Trap_0B, UnknownException, EXC_XFER_EE) EXCEPTION(0x0B00, Trap_0B, unknown_exception, EXC_XFER_EE)
/* 0x0C00 - System Call Exception */ /* 0x0C00 - System Call Exception */
START_EXCEPTION(0x0C00, SystemCall) START_EXCEPTION(0x0C00, SystemCall)
NORMAL_EXCEPTION_PROLOG NORMAL_EXCEPTION_PROLOG
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
EXCEPTION(0x0D00, Trap_0D, UnknownException, EXC_XFER_EE) EXCEPTION(0x0D00, Trap_0D, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0E00, Trap_0E, UnknownException, EXC_XFER_EE) EXCEPTION(0x0E00, Trap_0E, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x0F00, Trap_0F, UnknownException, EXC_XFER_EE) EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_EE)
/* 0x1000 - Programmable Interval Timer (PIT) Exception */ /* 0x1000 - Programmable Interval Timer (PIT) Exception */
START_EXCEPTION(0x1000, Decrementer) START_EXCEPTION(0x1000, Decrementer)
...@@ -444,14 +444,14 @@ label: ...@@ -444,14 +444,14 @@ label:
/* 0x1010 - Fixed Interval Timer (FIT) Exception /* 0x1010 - Fixed Interval Timer (FIT) Exception
*/ */
STND_EXCEPTION(0x1010, FITException, UnknownException) STND_EXCEPTION(0x1010, FITException, unknown_exception)
/* 0x1020 - Watchdog Timer (WDT) Exception /* 0x1020 - Watchdog Timer (WDT) Exception
*/ */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x1020, WDTException, WatchdogException) CRITICAL_EXCEPTION(0x1020, WDTException, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x1020, WDTException, UnknownException) CRITICAL_EXCEPTION(0x1020, WDTException, unknown_exception)
#endif #endif
#endif #endif
...@@ -656,25 +656,25 @@ label: ...@@ -656,25 +656,25 @@ label:
mfspr r10, SPRN_SPRG0 mfspr r10, SPRN_SPRG0
b InstructionAccess b InstructionAccess
EXCEPTION(0x1300, Trap_13, UnknownException, EXC_XFER_EE) EXCEPTION(0x1300, Trap_13, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1400, Trap_14, UnknownException, EXC_XFER_EE) EXCEPTION(0x1400, Trap_14, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
#ifdef CONFIG_IBM405_ERR51 #ifdef CONFIG_IBM405_ERR51
/* 405GP errata 51 */ /* 405GP errata 51 */
START_EXCEPTION(0x1700, Trap_17) START_EXCEPTION(0x1700, Trap_17)
b DTLBMiss b DTLBMiss
#else #else
EXCEPTION(0x1700, Trap_17, UnknownException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_EE)
#endif #endif
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1A00, Trap_1A, UnknownException, EXC_XFER_EE) EXCEPTION(0x1A00, Trap_1A, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1B00, Trap_1B, UnknownException, EXC_XFER_EE) EXCEPTION(0x1B00, Trap_1B, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1C00, Trap_1C, UnknownException, EXC_XFER_EE) EXCEPTION(0x1C00, Trap_1C, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1D00, Trap_1D, UnknownException, EXC_XFER_EE) EXCEPTION(0x1D00, Trap_1D, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1E00, Trap_1E, UnknownException, EXC_XFER_EE) EXCEPTION(0x1E00, Trap_1E, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1F00, Trap_1F, UnknownException, EXC_XFER_EE) EXCEPTION(0x1F00, Trap_1F, unknown_exception, EXC_XFER_EE)
/* Check for a single step debug exception while in an exception /* Check for a single step debug exception while in an exception
* handler before state has been saved. This is to catch the case * handler before state has been saved. This is to catch the case
......
arch/ppc/kernel/head_8xx.S
View file @ dc1c1ca3
...@@ -203,7 +203,7 @@ i##n: \ ...@@ -203,7 +203,7 @@ i##n: \
ret_from_except) ret_from_except)
/* System reset */ /* System reset */
EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD) EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
/* Machine check */ /* Machine check */
. = 0x200 . = 0x200
...@@ -214,7 +214,7 @@ MachineCheck: ...@@ -214,7 +214,7 @@ MachineCheck:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_STD(0x200, MachineCheckException) EXC_XFER_STD(0x200, machine_check_exception)
/* Data access exception. /* Data access exception.
* This is "never generated" by the MPC8xx. We jump to it for other * This is "never generated" by the MPC8xx. We jump to it for other
...@@ -252,20 +252,20 @@ Alignment: ...@@ -252,20 +252,20 @@ Alignment:
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE(0x600, AlignmentException) EXC_XFER_EE(0x600, alignment_exception)
/* Program check 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. /* 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 */ /* Decrementer */
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE) EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
EXCEPTION(0xa00, Trap_0a, UnknownException, EXC_XFER_EE) EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xb00, Trap_0b, UnknownException, EXC_XFER_EE) EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
/* System call */ /* System call */
. = 0xc00 . = 0xc00
...@@ -274,9 +274,9 @@ SystemCall: ...@@ -274,9 +274,9 @@ SystemCall:
EXC_XFER_EE_LITE(0xc00, DoSyscall) EXC_XFER_EE_LITE(0xc00, DoSyscall)
/* Single step - not used on 601 */ /* Single step - not used on 601 */
EXCEPTION(0xd00, SingleStep, SingleStepException, EXC_XFER_STD) EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
EXCEPTION(0xe00, Trap_0e, UnknownException, EXC_XFER_EE) EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0xf00, Trap_0f, UnknownException, EXC_XFER_EE) EXCEPTION(0xf00, Trap_0f, unknown_exception, EXC_XFER_EE)
/* On the MPC8xx, this is a software emulation interrupt. It occurs /* On the MPC8xx, this is a software emulation interrupt. It occurs
* for all unimplemented and illegal instructions. * for all unimplemented and illegal instructions.
...@@ -540,22 +540,22 @@ DataTLBError: ...@@ -540,22 +540,22 @@ DataTLBError:
#endif #endif
b DataAccess b DataAccess
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1600, Trap_16, UnknownException, EXC_XFER_EE) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1700, Trap_17, UnknownException, EXC_XFER_EE) EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1800, Trap_18, UnknownException, EXC_XFER_EE) EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1900, Trap_19, UnknownException, EXC_XFER_EE) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1a00, Trap_1a, UnknownException, EXC_XFER_EE) EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1b00, Trap_1b, UnknownException, EXC_XFER_EE) EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
/* On the MPC8xx, these next four traps are used for development /* On the MPC8xx, these next four traps are used for development
* support of breakpoints and such. Someday I will get around to * support of breakpoints and such. Someday I will get around to
* using them. * using them.
*/ */
EXCEPTION(0x1c00, Trap_1c, UnknownException, EXC_XFER_EE) EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1d00, Trap_1d, UnknownException, EXC_XFER_EE) EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1e00, Trap_1e, UnknownException, EXC_XFER_EE) EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
EXCEPTION(0x1f00, Trap_1f, UnknownException, EXC_XFER_EE) EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
. = 0x2000 . = 0x2000
......
arch/ppc/kernel/head_booke.h
View file @ dc1c1ca3
...@@ -335,7 +335,7 @@ label: ...@@ -335,7 +335,7 @@ label:
mfspr r4,SPRN_DEAR; /* Grab the DEAR and save it */ \ mfspr r4,SPRN_DEAR; /* Grab the DEAR and save it */ \
stw r4,_DEAR(r11); \ stw r4,_DEAR(r11); \
addi r3,r1,STACK_FRAME_OVERHEAD; \ addi r3,r1,STACK_FRAME_OVERHEAD; \
EXC_XFER_EE(0x0600, AlignmentException) EXC_XFER_EE(0x0600, alignment_exception)
#define PROGRAM_EXCEPTION \ #define PROGRAM_EXCEPTION \
START_EXCEPTION(Program) \ START_EXCEPTION(Program) \
...@@ -343,7 +343,7 @@ label: ...@@ -343,7 +343,7 @@ label:
mfspr r4,SPRN_ESR; /* Grab the ESR and save it */ \ mfspr r4,SPRN_ESR; /* Grab the ESR and save it */ \
stw r4,_ESR(r11); \ stw r4,_ESR(r11); \
addi r3,r1,STACK_FRAME_OVERHEAD; \ addi r3,r1,STACK_FRAME_OVERHEAD; \
EXC_XFER_STD(0x0700, ProgramCheckException) EXC_XFER_STD(0x0700, program_check_exception)
#define DECREMENTER_EXCEPTION \ #define DECREMENTER_EXCEPTION \
START_EXCEPTION(Decrementer) \ START_EXCEPTION(Decrementer) \
......
arch/ppc/kernel/head_fsl_booke.S
View file @ dc1c1ca3
...@@ -426,14 +426,14 @@ skpinv: addi r6,r6,1 /* Increment */ ...@@ -426,14 +426,14 @@ skpinv: addi r6,r6,1 /* Increment */
interrupt_base: interrupt_base:
/* Critical Input Interrupt */ /* Critical Input Interrupt */
CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException) CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
/* Machine Check Interrupt */ /* Machine Check Interrupt */
#ifdef CONFIG_E200 #ifdef CONFIG_E200
/* no RFMCI, MCSRRs on E200 */ /* no RFMCI, MCSRRs on E200 */
CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#else #else
MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException) MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
#endif #endif
/* Data Storage Interrupt */ /* Data Storage Interrupt */
...@@ -542,9 +542,9 @@ interrupt_base: ...@@ -542,9 +542,9 @@ interrupt_base:
#else #else
#ifdef CONFIG_E200 #ifdef CONFIG_E200
/* E200 treats 'normal' floating point instructions as FP Unavail exception */ /* E200 treats 'normal' floating point instructions as FP Unavail exception */
EXCEPTION(0x0800, FloatingPointUnavailable, ProgramCheckException, EXC_XFER_EE) EXCEPTION(0x0800, FloatingPointUnavailable, program_check_exception, EXC_XFER_EE)
#else #else
EXCEPTION(0x0800, FloatingPointUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x0800, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
#endif #endif
#endif #endif
...@@ -554,20 +554,20 @@ interrupt_base: ...@@ -554,20 +554,20 @@ interrupt_base:
EXC_XFER_EE_LITE(0x0c00, DoSyscall) EXC_XFER_EE_LITE(0x0c00, DoSyscall)
/* Auxillary Processor Unavailable Interrupt */ /* Auxillary Processor Unavailable Interrupt */
EXCEPTION(0x2900, AuxillaryProcessorUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2900, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
/* Decrementer Interrupt */ /* Decrementer Interrupt */
DECREMENTER_EXCEPTION DECREMENTER_EXCEPTION
/* Fixed Internal Timer Interrupt */ /* Fixed Internal Timer Interrupt */
/* TODO: Add FIT support */ /* TODO: Add FIT support */
EXCEPTION(0x3100, FixedIntervalTimer, UnknownException, EXC_XFER_EE) EXCEPTION(0x3100, FixedIntervalTimer, unknown_exception, EXC_XFER_EE)
/* Watchdog Timer Interrupt */ /* Watchdog Timer Interrupt */
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
CRITICAL_EXCEPTION(0x3200, WatchdogTimer, WatchdogException) CRITICAL_EXCEPTION(0x3200, WatchdogTimer, WatchdogException)
#else #else
CRITICAL_EXCEPTION(0x3200, WatchdogTimer, UnknownException) CRITICAL_EXCEPTION(0x3200, WatchdogTimer, unknown_exception)
#endif #endif
/* Data TLB Error Interrupt */ /* Data TLB Error Interrupt */
...@@ -696,21 +696,21 @@ interrupt_base: ...@@ -696,21 +696,21 @@ interrupt_base:
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE_LITE(0x2010, KernelSPE) EXC_XFER_EE_LITE(0x2010, KernelSPE)
#else #else
EXCEPTION(0x2020, SPEUnavailable, UnknownException, EXC_XFER_EE) EXCEPTION(0x2020, SPEUnavailable, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_SPE */ #endif /* CONFIG_SPE */
/* SPE Floating Point Data */ /* SPE Floating Point Data */
#ifdef CONFIG_SPE #ifdef CONFIG_SPE
EXCEPTION(0x2030, SPEFloatingPointData, SPEFloatingPointException, EXC_XFER_EE); EXCEPTION(0x2030, SPEFloatingPointData, SPEFloatingPointException, EXC_XFER_EE);
#else #else
EXCEPTION(0x2040, SPEFloatingPointData, UnknownException, EXC_XFER_EE) EXCEPTION(0x2040, SPEFloatingPointData, unknown_exception, EXC_XFER_EE)
#endif /* CONFIG_SPE */ #endif /* CONFIG_SPE */
/* SPE Floating Point Round */ /* SPE Floating Point Round */
EXCEPTION(0x2050, SPEFloatingPointRound, UnknownException, EXC_XFER_EE) EXCEPTION(0x2050, SPEFloatingPointRound, unknown_exception, EXC_XFER_EE)
/* Performance Monitor */ /* Performance Monitor */
EXCEPTION(0x2060, PerformanceMonitor, PerformanceMonitorException, EXC_XFER_STD) EXCEPTION(0x2060, PerformanceMonitor, performance_monitor_exception, EXC_XFER_STD)
/* Debug Interrupt */ /* Debug Interrupt */
......
arch/ppc/kernel/ppc_ksyms.c
View file @ dc1c1ca3
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
extern void transfer_to_handler(void); extern void transfer_to_handler(void);
extern void do_IRQ(struct pt_regs *regs); extern void do_IRQ(struct pt_regs *regs);
extern void MachineCheckException(struct pt_regs *regs); extern void machine_check_exception(struct pt_regs *regs);
extern void AlignmentException(struct pt_regs *regs); extern void alignment_exception(struct pt_regs *regs);
extern void ProgramCheckException(struct pt_regs *regs); extern void program_check_exception(struct pt_regs *regs);
extern void SingleStepException(struct pt_regs *regs); extern void single_step_exception(struct pt_regs *regs);
extern int do_signal(sigset_t *, struct pt_regs *); extern int do_signal(sigset_t *, struct pt_regs *);
extern int pmac_newworld; extern int pmac_newworld;
extern int sys_sigreturn(struct pt_regs *regs); extern int sys_sigreturn(struct pt_regs *regs);
...@@ -72,10 +72,10 @@ EXPORT_SYMBOL(clear_user_page); ...@@ -72,10 +72,10 @@ EXPORT_SYMBOL(clear_user_page);
EXPORT_SYMBOL(do_signal); EXPORT_SYMBOL(do_signal);
EXPORT_SYMBOL(transfer_to_handler); EXPORT_SYMBOL(transfer_to_handler);
EXPORT_SYMBOL(do_IRQ); EXPORT_SYMBOL(do_IRQ);
EXPORT_SYMBOL(MachineCheckException); EXPORT_SYMBOL(machine_check_exception);
EXPORT_SYMBOL(AlignmentException); EXPORT_SYMBOL(alignment_exception);
EXPORT_SYMBOL(ProgramCheckException); EXPORT_SYMBOL(program_check_exception);
EXPORT_SYMBOL(SingleStepException); EXPORT_SYMBOL(single_step_exception);
EXPORT_SYMBOL(sys_sigreturn); EXPORT_SYMBOL(sys_sigreturn);
EXPORT_SYMBOL(ppc_n_lost_interrupts); EXPORT_SYMBOL(ppc_n_lost_interrupts);
EXPORT_SYMBOL(ppc_lost_interrupts); EXPORT_SYMBOL(ppc_lost_interrupts);
......
arch/ppc/kernel/traps.c
View file @ dc1c1ca3
...@@ -74,7 +74,7 @@ void (*debugger_fault_handler)(struct pt_regs *regs); ...@@ -74,7 +74,7 @@ void (*debugger_fault_handler)(struct pt_regs *regs);
DEFINE_SPINLOCK(die_lock); DEFINE_SPINLOCK(die_lock);
void die(const char * str, struct pt_regs * fp, long err) int die(const char * str, struct pt_regs * fp, long err)
{ {
static int die_counter; static int die_counter;
int nl = 0; int nl = 0;
...@@ -232,7 +232,7 @@ platform_machine_check(struct pt_regs *regs) ...@@ -232,7 +232,7 @@ platform_machine_check(struct pt_regs *regs)
{ {
} }
void MachineCheckException(struct pt_regs *regs) void machine_check_exception(struct pt_regs *regs)
{ {
unsigned long reason = get_mc_reason(regs); unsigned long reason = get_mc_reason(regs);
...@@ -393,14 +393,14 @@ void SMIException(struct pt_regs *regs) ...@@ -393,14 +393,14 @@ void SMIException(struct pt_regs *regs)
#endif #endif
} }
void UnknownException(struct pt_regs *regs) void unknown_exception(struct pt_regs *regs)
{ {
printk("Bad trap at PC: %lx, MSR: %lx, vector=%lx %s\n", printk("Bad trap at PC: %lx, MSR: %lx, vector=%lx %s\n",
regs->nip, regs->msr, regs->trap, print_tainted()); regs->nip, regs->msr, regs->trap, print_tainted());
_exception(SIGTRAP, regs, 0, 0); _exception(SIGTRAP, regs, 0, 0);
} }
void InstructionBreakpoint(struct pt_regs *regs) void instruction_breakpoint_exception(struct pt_regs *regs)
{ {
if (debugger_iabr_match(regs)) if (debugger_iabr_match(regs))
return; return;
...@@ -622,7 +622,7 @@ int check_bug_trap(struct pt_regs *regs) ...@@ -622,7 +622,7 @@ int check_bug_trap(struct pt_regs *regs)
return 0; return 0;
} }
void ProgramCheckException(struct pt_regs *regs) void program_check_exception(struct pt_regs *regs)
{ {
unsigned int reason = get_reason(regs); unsigned int reason = get_reason(regs);
extern int do_mathemu(struct pt_regs *regs); extern int do_mathemu(struct pt_regs *regs);
...@@ -701,7 +701,7 @@ void ProgramCheckException(struct pt_regs *regs) ...@@ -701,7 +701,7 @@ void ProgramCheckException(struct pt_regs *regs)
_exception(SIGILL, regs, ILL_ILLOPC, regs->nip); _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
} }
void SingleStepException(struct pt_regs *regs) void single_step_exception(struct pt_regs *regs)
{ {
regs->msr &= ~(MSR_SE | MSR_BE); /* Turn off 'trace' bits */ regs->msr &= ~(MSR_SE | MSR_BE); /* Turn off 'trace' bits */
if (debugger_sstep(regs)) if (debugger_sstep(regs))
...@@ -709,7 +709,7 @@ void SingleStepException(struct pt_regs *regs) ...@@ -709,7 +709,7 @@ void SingleStepException(struct pt_regs *regs)
_exception(SIGTRAP, regs, TRAP_TRACE, 0); _exception(SIGTRAP, regs, TRAP_TRACE, 0);
} }
void AlignmentException(struct pt_regs *regs) void alignment_exception(struct pt_regs *regs)
{ {
int fixed; int fixed;
...@@ -814,7 +814,7 @@ void TAUException(struct pt_regs *regs) ...@@ -814,7 +814,7 @@ void TAUException(struct pt_regs *regs)
} }
#endif /* CONFIG_INT_TAU */ #endif /* CONFIG_INT_TAU */
void AltivecUnavailException(struct pt_regs *regs) void altivec_unavailable_exception(struct pt_regs *regs)
{ {
static int kernel_altivec_count; static int kernel_altivec_count;
...@@ -835,7 +835,7 @@ void AltivecUnavailException(struct pt_regs *regs) ...@@ -835,7 +835,7 @@ void AltivecUnavailException(struct pt_regs *regs)
} }
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
void AltivecAssistException(struct pt_regs *regs) void altivec_assist_exception(struct pt_regs *regs)
{ {
int err; int err;
...@@ -872,7 +872,7 @@ void AltivecAssistException(struct pt_regs *regs) ...@@ -872,7 +872,7 @@ void AltivecAssistException(struct pt_regs *regs)
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
#ifdef CONFIG_E500 #ifdef CONFIG_E500
void PerformanceMonitorException(struct pt_regs *regs) void performance_monitor_exception(struct pt_regs *regs)
{ {
perf_irq(regs); perf_irq(regs);
} }
......
arch/ppc/syslib/ibm44x_common.c
View file @ dc1c1ca3
...@@ -178,7 +178,7 @@ void __init ibm44x_platform_init(void) ...@@ -178,7 +178,7 @@ void __init ibm44x_platform_init(void)
#endif #endif
} }
/* Called from MachineCheckException */ /* Called from machine_check_exception */
void platform_machine_check(struct pt_regs *regs) void platform_machine_check(struct pt_regs *regs)
{ {
printk("PLB0: BEAR=0x%08x%08x ACR= 0x%08x BESR= 0x%08x\n", printk("PLB0: BEAR=0x%08x%08x ACR= 0x%08x BESR= 0x%08x\n",
......
arch/ppc/syslib/ppc4xx_setup.c
View file @ dc1c1ca3
...@@ -279,7 +279,7 @@ ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5, ...@@ -279,7 +279,7 @@ ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */ #endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */
} }
/* Called from MachineCheckException */ /* Called from machine_check_exception */
void platform_machine_check(struct pt_regs *regs) void platform_machine_check(struct pt_regs *regs)
{ {
#if defined(DCRN_PLB0_BEAR) #if defined(DCRN_PLB0_BEAR)
......
arch/ppc64/kernel/Makefile
View file @ dc1c1ca3
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Makefile for the linux ppc64 kernel. # Makefile for the linux ppc64 kernel.
# #
ifneq ($(CONFIG_PPC_MERGE),y)
EXTRA_CFLAGS += -mno-minimal-toc EXTRA_CFLAGS += -mno-minimal-toc
extra-y := head.o vmlinux.lds extra-y := head.o vmlinux.lds
...@@ -77,3 +79,9 @@ endif ...@@ -77,3 +79,9 @@ endif
# These are here while we do the architecture merge # These are here while we do the architecture merge
vecemu-y += ../../powerpc/kernel/vecemu.o vecemu-y += ../../powerpc/kernel/vecemu.o
vector-y += ../../powerpc/kernel/vector.o vector-y += ../../powerpc/kernel/vector.o
idle_power4-y += ../../powerpc/kernel/idle_power4.o
traps-y += ../../powerpc/kernel/traps.o
else
endif
arch/ppc64/kernel/traps.c deleted 100644 → 0
View file @ d96024c6
This diff is collapsed.
include/asm-ppc/system.h
View file @ dc1c1ca3
...@@ -87,7 +87,7 @@ extern void cacheable_memzero(void *p, unsigned int nb); ...@@ -87,7 +87,7 @@ extern void cacheable_memzero(void *p, unsigned int nb);
extern void *cacheable_memcpy(void *, const void *, unsigned int); extern void *cacheable_memcpy(void *, const void *, unsigned int);
extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long); extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
extern void bad_page_fault(struct pt_regs *, unsigned long, int); extern void bad_page_fault(struct pt_regs *, unsigned long, int);
extern void die(const char *, struct pt_regs *, long); extern int die(const char *, struct pt_regs *, long);
extern void _exception(int, struct pt_regs *, int, unsigned long); extern void _exception(int, struct pt_regs *, int, unsigned long);
#ifdef CONFIG_BOOKE_WDT #ifdef CONFIG_BOOKE_WDT
extern u32 booke_wdt_enabled; extern u32 booke_wdt_enabled;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment