Changeset e6a78b9 in mainline for kernel/arch/sparc64/src/sun4v/sparc64.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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.

File:

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

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -154 +154 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }