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

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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

@@ -67 +67 @@
         /* 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 */