Changeset 32573ff in mainline for kernel/arch/amd64/src/proc/scheduler.c

Timestamp:

2016-05-02T20:58:16Z (8 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/amd64/src/proc/scheduler.c (modified) (2 diffs)

kernel/arch/amd64/src/proc/scheduler.c

@@ -42 +42 @@
 #include <arch/pm.h>
 #include <arch/ddi/ddi.h>
+#include <arch/kseg_struct.h>
 
 /** Perform amd64 specific tasks needed before the new task is run.
@@ -55 +56 @@
 void before_thread_runs_arch(void)
 {
-        CPU->arch.tss->rsp0 =
-            (uintptr_t) &THREAD->kstack[STACK_SIZE];
-        
-        /*
-         * Syscall support.
-         */
-        swapgs();
-        write_msr(AMD_MSR_GS, (uintptr_t) THREAD->arch.syscall_rsp);
-        swapgs();
-        
-        /* TLS support - set FS to thread local storage */
-        write_msr(AMD_MSR_FS, THREAD->arch.tls);
+        CPU->arch.tss->rsp0 = (uintptr_t) &THREAD->kstack[STACK_SIZE];
+
+        kseg_t *kseg = (kseg_t *) read_msr(AMD_MSR_GS_KERNEL);  
+        kseg->kstack_rsp = THREAD->arch.kstack_rsp;
 }