Changeset 89c57b6 in mainline for kernel/arch/arm32/src/userspace.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/userspace.c (modified) (1 diff)

kernel/arch/arm32/src/userspace.c

@@ -97 +97 @@
                 "mov sp, %[ustate]\n"
                 "msr spsr_c, %[user_mode]\n"
-                "ldmfd sp!, {r0-r12, sp, lr}^\n"
+                "ldmfd sp, {r0-r12, sp, lr}^\n"
+                "nop\n"         /* Cannot access sp immediately after ldm(2) */
+                "add sp, sp, #(15*4)\n"
                 "ldmfd sp!, {pc}^\n"
                 :: [ustate] "r" (&ustate), [user_mode] "r" (user_mode)