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

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

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)