diff options
Diffstat (limited to 'arch/powerpc/kernel/head_44x.S')
-rw-r--r-- | arch/powerpc/kernel/head_44x.S | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 22d608e8bb7..7a2e5e421ab 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
@@ -248,10 +248,11 @@ _ENTRY(_start); | |||
248 | 248 | ||
249 | interrupt_base: | 249 | interrupt_base: |
250 | /* Critical Input Interrupt */ | 250 | /* Critical Input Interrupt */ |
251 | CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception) | 251 | CRITICAL_EXCEPTION(0x0100, CRITICAL, CriticalInput, unknown_exception) |
252 | 252 | ||
253 | /* Machine Check Interrupt */ | 253 | /* Machine Check Interrupt */ |
254 | CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception) | 254 | CRITICAL_EXCEPTION(0x0200, MACHINE_CHECK, MachineCheck, \ |
255 | machine_check_exception) | ||
255 | MCHECK_EXCEPTION(0x0210, MachineCheckA, machine_check_exception) | 256 | MCHECK_EXCEPTION(0x0210, MachineCheckA, machine_check_exception) |
256 | 257 | ||
257 | /* Data Storage Interrupt */ | 258 | /* Data Storage Interrupt */ |
@@ -261,7 +262,8 @@ interrupt_base: | |||
261 | INSTRUCTION_STORAGE_EXCEPTION | 262 | INSTRUCTION_STORAGE_EXCEPTION |
262 | 263 | ||
263 | /* External Input Interrupt */ | 264 | /* External Input Interrupt */ |
264 | EXCEPTION(0x0500, ExternalInput, do_IRQ, EXC_XFER_LITE) | 265 | EXCEPTION(0x0500, BOOKE_INTERRUPT_EXTERNAL, ExternalInput, \ |
266 | do_IRQ, EXC_XFER_LITE) | ||
265 | 267 | ||
266 | /* Alignment Interrupt */ | 268 | /* Alignment Interrupt */ |
267 | ALIGNMENT_EXCEPTION | 269 | ALIGNMENT_EXCEPTION |
@@ -273,29 +275,32 @@ interrupt_base: | |||
273 | #ifdef CONFIG_PPC_FPU | 275 | #ifdef CONFIG_PPC_FPU |
274 | FP_UNAVAILABLE_EXCEPTION | 276 | FP_UNAVAILABLE_EXCEPTION |
275 | #else | 277 | #else |
276 | EXCEPTION(0x2010, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE) | 278 | EXCEPTION(0x2010, BOOKE_INTERRUPT_FP_UNAVAIL, \ |
279 | FloatingPointUnavailable, unknown_exception, EXC_XFER_EE) | ||
277 | #endif | 280 | #endif |
278 | /* System Call Interrupt */ | 281 | /* System Call Interrupt */ |
279 | START_EXCEPTION(SystemCall) | 282 | START_EXCEPTION(SystemCall) |
280 | NORMAL_EXCEPTION_PROLOG | 283 | NORMAL_EXCEPTION_PROLOG(BOOKE_INTERRUPT_SYSCALL) |
281 | EXC_XFER_EE_LITE(0x0c00, DoSyscall) | 284 | EXC_XFER_EE_LITE(0x0c00, DoSyscall) |
282 | 285 | ||
283 | /* Auxiliary Processor Unavailable Interrupt */ | 286 | /* Auxiliary Processor Unavailable Interrupt */ |
284 | EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE) | 287 | EXCEPTION(0x2020, BOOKE_INTERRUPT_AP_UNAVAIL, \ |
288 | AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE) | ||
285 | 289 | ||
286 | /* Decrementer Interrupt */ | 290 | /* Decrementer Interrupt */ |
287 | DECREMENTER_EXCEPTION | 291 | DECREMENTER_EXCEPTION |
288 | 292 | ||
289 | /* Fixed Internal Timer Interrupt */ | 293 | /* Fixed Internal Timer Interrupt */ |
290 | /* TODO: Add FIT support */ | 294 | /* TODO: Add FIT support */ |
291 | EXCEPTION(0x1010, FixedIntervalTimer, unknown_exception, EXC_XFER_EE) | 295 | EXCEPTION(0x1010, BOOKE_INTERRUPT_FIT, FixedIntervalTimer, \ |
296 | unknown_exception, EXC_XFER_EE) | ||
292 | 297 | ||
293 | /* Watchdog Timer Interrupt */ | 298 | /* Watchdog Timer Interrupt */ |
294 | /* TODO: Add watchdog support */ | 299 | /* TODO: Add watchdog support */ |
295 | #ifdef CONFIG_BOOKE_WDT | 300 | #ifdef CONFIG_BOOKE_WDT |
296 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException) | 301 | CRITICAL_EXCEPTION(0x1020, WATCHDOG, WatchdogTimer, WatchdogException) |
297 | #else | 302 | #else |
298 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, unknown_exception) | 303 | CRITICAL_EXCEPTION(0x1020, WATCHDOG, WatchdogTimer, unknown_exception) |
299 | #endif | 304 | #endif |
300 | 305 | ||
301 | /* Data TLB Error Interrupt */ | 306 | /* Data TLB Error Interrupt */ |