Changeset 8b36bf2 in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/amd64/src/userspace.c (modified) (3 diffs)

kernel/arch/amd64/src/userspace.c

@@ -55 +55 @@
         asm volatile (
                 "pushq %[udata_des]\n"
-                "pushq %[stack_size]\n"
+                "pushq %[stack_top]\n"
                 "pushq %[ipl]\n"
                 "pushq %[utext_des]\n"
@@ -65 +65 @@
                 "iretq\n"
                 :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                   [stack_size] "r" (kernel_uarg->uspace_stack + STACK_SIZE),
+                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                       kernel_uarg->uspace_stack_size),
                    [ipl] "r" (ipl),
                    [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
@@ -74 +75 @@
         
         /* Unreachable */
-        while (1)
-                ;
+        while (1);
 }