Changeset 2f23341 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-05-19T20:04:09Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

326bf65

Parents:

2a922c8

Message:

Fix ia64 regression introduced in mainline,966.
The ia64 stack is actually two stacks in one:

• the regular memory stack, which is now STACK_SIZE / 2 bytes long
• and the equally sized RSE stack

Note that ia64 is now the only architecture which effectively uses
only one memory frame for its memory stack.

File:

• kernel/arch/ia64/src/ia64.c (modified) (1 diff)

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) + STACK_SIZE -
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE,
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);