Changeset 89c57b6 in mainline for kernel/arch/ia32/src/proc/scheduler.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/ia32/src/proc/scheduler.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <arch/context.h>  /* SP_DELTA */
+#include <arch/interrupt.h>
 #include <arch/pm.h>
 #include <arch/asm.h>
@@ -58 +58 @@
 void before_thread_runs_arch(void)
 {
-        uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
-            SP_DELTA];
+        uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
         
         if (CPU->arch.fi.bits.sep) {
                 /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
-                write_msr(IA32_MSR_SYSENTER_ESP, kstk);
+                write_msr(IA32_MSR_SYSENTER_ESP, kstk - sizeof(istate_t));
         }
         
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
         CPU->arch.tss->esp0 = kstk;
-        CPU->arch.tss->ss0 = gdtselector(KDATA_DES);
+        CPU->arch.tss->ss0 = GDT_SELECTOR(KDATA_DES);
         
         /* Set up TLS in GS register */