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

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

338810f

Parents:

de73242 (diff), 94795812 (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:

• kernel/arch/arm32/src/exc_handler.S (modified) (1 diff)

kernel/arch/arm32/src/exc_handler.S

@@ -130 +130 @@
         stmfd r13!, {r2}
 2:
+        sub sp, sp, #4
 .endm
 
 .macro LOAD_REGS_FROM_STACK
+        add sp, sp, #4
         ldmfd r13!, {r0}
         msr spsr, r0