Changes in kernel/arch/arm32/src/userspace.c [e762b43:dfd735a1] in mainline

File:

• kernel/arch/arm32/src/userspace.c (modified) (3 diffs)

kernel/arch/arm32/src/userspace.c

@@ -35 +35 @@
 
 #include <userspace.h>
+#include <arch/ras.h>
 
 /** Struct for holding all general purpose registers.
@@ -74 +75 @@
         ustate.r1 = 0;
 
+        /* pass the RAS page address in %r2 */
+        ustate.r2 = (uintptr_t) ras_page;
+
         /* clear other registers */
-        ustate.r2 = ustate.r3  = ustate.r4  = ustate.r5 =
-            ustate.r6  = ustate.r7  = ustate.r8  = ustate.r9 = ustate.r10 = 
-            ustate.r11 = ustate.r12 = ustate.lr = 0;
+        ustate.r3  = ustate.r4  = ustate.r5 = ustate.r6 = ustate.r7 =
+            ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 =
+            ustate.lr = 0;
 
         /* set user stack */
@@ -93 +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)