Changeset df29f24 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

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) + 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);