Changeset 1affcdf3 in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (1 diff)

kernel/arch/amd64/src/userspace.c

@@ -66 +66 @@
                 "iretq\n"
                 :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                   [stack_size] "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                   [stack_size] "r" (kernel_uarg->uspace_stack + STACK_SIZE),
                    [ipl] "r" (ipl),
                    [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),