Changeset 3e828ea in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

kernel/arch/ia64/src/ia64.c

@@ -244 +244 @@
          * uspace_stack_size / 2 bytes.
          */
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2,
-            (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
+            kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
         while (true)