Changes in kernel/arch/ia32/src/userspace.c [0f17bff:2902e1bb] in mainline

File:

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

kernel/arch/ia32/src/userspace.c ¶

@@ -39 +39 @@
 #include <abi/proc/uarg.h>
 #include <mm/as.h>
-#include <arch/cpu.h>
-#include <arch/asm.h>
 
 /** Enter userspace
@@ -49 +47 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        uint32_t eflags = read_eflags();
+        ipl_t ipl = interrupts_disable();
         
         asm volatile (
-                /* Set up GS register (virtual register segment) */
-                "movl %[vreg_des], %%gs\n"
+                /*
+                 * Clear nested task flag.
+                 */
+                "pushfl\n"
+                "pop %%eax\n"
+                "and $0xffffbfff, %%eax\n"
+                "push %%eax\n"
+                "popfl\n"
+                
+                /* Set up GS register (TLS) */
+                "movl %[tls_des], %%gs\n"
                 
                 "pushl %[udata_des]\n"
                 "pushl %[stack_top]\n"
-                "pushl %[eflags]\n"
+                "pushl %[ipl]\n"
                 "pushl %[utext_des]\n"
                 "pushl %[entry]\n"
@@ -67 +74 @@
                 "iret\n"
                 :
-                : [eflags_mask] "i" (~EFLAGS_NT),
-                  [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
+                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
                       kernel_uarg->uspace_stack_size),
-                  [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),
+                  [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [vreg_des] "r" (GDT_SELECTOR(VREG_DES))
+                  [tls_des] "r" (GDT_SELECTOR(TLS_DES))
                 : "eax");