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

Timestamp:

2011-06-01T10:04:32Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

65c3794

Parents:

049a16f (diff), df29f24 (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 with usb/development

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),