Changeset df3c6f02 in mainline for kernel/arch/ia32/src/userspace.c

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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/ia32/src/userspace.c (modified) (1 diff)

kernel/arch/ia32/src/userspace.c

@@ -76 +76 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),