Changes in kernel/arch/ia64/src/ia64.c [c0699467:f902d36] in mainline

File:

• kernel/arch/ia64/src/ia64.c (modified) (3 diffs)

kernel/arch/ia64/src/ia64.c

@@ -50 +50 @@
 #include <userspace.h>
 #include <console/console.h>
-#include <abi/proc/uarg.h>
+#include <proc/uarg.h>
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
@@ -151 +151 @@
         /* Set platform name. */
 #ifdef MACHINE_ski
-        platform = "ski";
+        platform = "pc";
 #endif
 #ifdef MACHINE_i460GX
@@ -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 / 2 -
+            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
+            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);