Changeset 46c20c8 in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (2 diffs)

kernel/arch/amd64/src/userspace.c

@@ -36 +36 @@
 #include <arch/cpu.h>
 #include <arch/pm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>
@@ -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)