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

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:

• kernel/arch/ia32/src/userspace.c (modified) (2 diffs)

kernel/arch/ia32/src/userspace.c

@@ -59 +59 @@
                 "popfl\n"
                 
-                /* Set up GS register (TLS) */
-                "movl %[tls_des], %%gs\n"
+                /* Set up GS register (virtual register segment) */
+                "movl %[vreg_des], %%gs\n"
                 
                 "pushl %[udata_des]\n"
@@ -81 +81 @@
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [tls_des] "r" (GDT_SELECTOR(TLS_DES))
+                  [vreg_des] "r" (GDT_SELECTOR(VREG_DES))
                 : "eax");