Changes in kernel/arch/arm64/src/arm64.c [84176f3:db17889] in mainline

File:

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

kernel/arch/arm64/src/arm64.c

@@ -156 +156 @@
 
         /* Set program entry. */
-        ELR_EL1_write((uint64_t) kernel_uarg->uspace_entry);
+        ELR_EL1_write(kernel_uarg->uspace_entry);
 
         /* Set user stack. */
-        SP_EL0_write(((uint64_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size));
+        SP_EL0_write(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size);
 
         /* Clear Thread ID register. */
@@ -167 +167 @@
         asm volatile (
             /*
-             * Clear all general-purpose registers, except x0 that holds an
-             * argument for the user space.
+             * Reset the kernel stack to its base value.
+             *
+             * Clear all general-purpose registers,
+             * except x0 that holds an argument for
+             * the user space.
              */
+            "mov sp, %[kstack]\n"
             "mov x0, %[uspace_uarg]\n"
             "mov x1, #0\n"
@@ -202 +206 @@
             "mov x30, #0\n"
             "eret\n"
-            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg)
+            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg),
+              [kstack] "r" (((uint64_t) (THREAD->kstack)) +
+              MEM_STACK_SIZE - SP_DELTA)
         );