Changeset 985e26d2 in mainline for kernel/arch/ia32/src/proc/scheduler.c

Timestamp:

2010-01-07T19:06:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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) (1 diff)

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

@@ -61 +61 @@
             SP_DELTA];
         
-        /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
-        write_msr(IA32_MSR_SYSENTER_ESP, kstk);
+        if (CPU->arch.fi.bits.sep) {
+                /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
+                write_msr(IA32_MSR_SYSENTER_ESP, kstk);
+        }
         
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */