Changeset 89c57b6 in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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

@@ -65 +65 @@
                 "xorq %%rdi, %%rdi\n"
                 "iretq\n"
-                :: [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
+                :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                    [stack_size] "r" (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)