Changeset 9d47440 in mainline for kernel/arch/ia64/src

Timestamp:

2011-05-21T16:23:17Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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.

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (1 diff)
• proc/scheduler.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -249 +249 @@
         rsc.mode = 3;                   /* eager mode */
 
+        /*
+         * Switch to userspace.
+         *
+         * When calculating stack addresses, mind the stack split between the
+         * memory stack and the RSE stack. Each occuppies STACK_SIZE / 2 bytes.
+         */
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE -
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE,
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 

kernel/arch/ia64/src/proc/scheduler.c

@@ -79 +79 @@
          * Record address of kernel stack to bank 0 r23.
          * These values will be found there after switch from userspace.
+         *
+         * Mind the 1:1 split of the entire STACK_SIZE long region between the
+         * memory stack and the RSE stack.
          */
         asm volatile (
@@ -86 +89 @@
                 "bsw.1\n"
                 :
-                : "r" (&THREAD->kstack[THREAD_STACK_SIZE]),
-                  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA])
+                : "r" (&THREAD->kstack[STACK_SIZE / 2]),
+                  "r" (&THREAD->kstack[STACK_SIZE / 2 - SP_DELTA])
                 );
 }