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

Timestamp:

2010-09-02T20:55:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (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

@@ -75 +75 @@
                 "iret\n"
                 :
-                : [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
+                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
                   [ipl] "r" (ipl),
-                  [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
+                  [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [tls_des] "r" (gdtselector(TLS_DES))
+                  [tls_des] "r" (GDT_SELECTOR(TLS_DES))
                 : "eax");