Changeset 371bd7d in mainline for kernel/arch/arm32/src/exc_handler.S


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/src/exc_handler.S

    rcd82bb1 r371bd7d  
    123123        stmfd r13!, {r2}
    1241242:
     125        # Stop stack traces here
     126        mov fp, #0
    125127.endm
    126128
     
    148150        mov r0, #0
    149151        mov r1, r13
    150         bl exc_dispatch
     152        bl ras_check
    151153        LOAD_REGS_FROM_STACK
    152154
     
    156158        mov r0, #5
    157159        mov r1, r13
    158         bl exc_dispatch
     160        bl ras_check
    159161        LOAD_REGS_FROM_STACK
    160162
     
    164166        mov r0, #6
    165167        mov r1, r13
    166         bl exc_dispatch
     168        bl ras_check
    167169        LOAD_REGS_FROM_STACK
    168170
     
    171173        mov r0, #1
    172174        mov r1, r13
    173         bl exc_dispatch
     175        bl ras_check
    174176        LOAD_REGS_FROM_STACK
    175177
     
    179181        mov r0, #3
    180182        mov r1, r13
    181         bl exc_dispatch
     183        bl ras_check
    182184        LOAD_REGS_FROM_STACK
    183185
     
    187189        mov r0, #4
    188190        mov r1, r13
    189         bl exc_dispatch
     191        bl ras_check
    190192        LOAD_REGS_FROM_STACK
    191193
     
    195197        mov r0, #2
    196198        mov r1, r13
    197         bl exc_dispatch
    198         LOAD_REGS_FROM_STACK
    199 
     199        bl ras_check
     200        LOAD_REGS_FROM_STACK
     201
Note: See TracChangeset for help on using the changeset viewer.