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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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

@@ -60 +60 @@
         uintptr_t kstk = (uintptr_t) &THREAD->kstack[STACK_SIZE];
         
+#ifndef PROCESSOR_i486
         if (CPU->arch.fi.bits.sep) {
                 /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
                 write_msr(IA32_MSR_SYSENTER_ESP, kstk - sizeof(istate_t));
         }
+#endif
         
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */