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

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/proc/scheduler.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <arch/context.h>       /* SP_DELTA */
 #include <arch/asm.h>
 #include <print.h>
@@ -57 +56 @@
 {
         CPU->arch.tss->rsp0 =
-            (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
-
+            (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
+        
         /*
          * Syscall support.
          */
         swapgs();
-        write_msr(AMD_MSR_GS, (uintptr_t)THREAD->arch.syscall_rsp);
+        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);