Commit 31ae6999 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 2df99e60 8ded1457
...@@ -26,28 +26,27 @@ ...@@ -26,28 +26,27 @@
/* /*
* Invalid mode handlers * Invalid mode handlers
*/ */
__pabt_invalid: sub sp, sp, #S_FRAME_SIZE @ Allocate frame size in one go .macro inv_entry, sym, reason
stmia sp, {r0 - lr} @ Save XXX r0 - lr sub sp, sp, #S_FRAME_SIZE @ Allocate frame size in one go
ldr r4, .LCabt stmia sp, {r0 - lr} @ Save XXX r0 - lr
mov r1, #BAD_PREFETCH ldr r4, .LC\sym
mov r1, #\reason
.endm
__pabt_invalid:
inv_entry abt, BAD_PREFETCH
b 1f b 1f
__dabt_invalid: sub sp, sp, #S_FRAME_SIZE __dabt_invalid:
stmia sp, {r0 - lr} @ Save SVC r0 - lr [lr *should* be intact] inv_entry abt, BAD_DATA
ldr r4, .LCabt
mov r1, #BAD_DATA
b 1f b 1f
__irq_invalid: sub sp, sp, #S_FRAME_SIZE @ Allocate space on stack for frame __irq_invalid:
stmfd sp, {r0 - lr} @ Save r0 - lr inv_entry irq, BAD_IRQ
ldr r4, .LCirq
mov r1, #BAD_IRQ
b 1f b 1f
__und_invalid: sub sp, sp, #S_FRAME_SIZE __und_invalid:
stmia sp, {r0 - lr} inv_entry und, BAD_UNDEFINSTR
ldr r4, .LCund
mov r1, #BAD_UNDEFINSTR @ int reason
1: zero_fp 1: zero_fp
ldmia r4, {r5 - r7} @ Get XXX pc, cpsr, old_r0 ldmia r4, {r5 - r7} @ Get XXX pc, cpsr, old_r0
......
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