Changeset 0dc2fec in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2016-05-22T19:19:43Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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

@@ -48 +48 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        ipl_t ipl = interrupts_disable();
+        uint64_t rflags = read_rflags();
         
-        ipl &= ~(RFLAGS_CF | RFLAGS_PF | RFLAGS_AF | RFLAGS_ZF | RFLAGS_SF |
-            RFLAGS_DF | RFLAGS_OF);
+        rflags &= ~RFLAGS_NT;
+        rflags |= RFLAGS_IF;
         
         asm volatile (
                 "pushq %[udata_des]\n"
                 "pushq %[stack_top]\n"
-                "pushq %[ipl]\n"
+                "pushq %[rflags]\n"
                 "pushq %[utext_des]\n"
                 "pushq %[entry]\n"
@@ -67 +67 @@
                    [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
                        kernel_uarg->uspace_stack_size),
-                   [ipl] "r" (ipl),
+                   [rflags] "r" (rflags),
                    [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                    [entry] "r" (kernel_uarg->uspace_entry),