Changeset efedee77 in mainline for kernel/arch/amd64/src/pm.c

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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/pm.c (modified) (2 diffs)

kernel/arch/amd64/src/pm.c

@@ -171 +171 @@
 
                 d->unused = 0;
-                d->selector = gdtselector(KTEXT_DES);
+                d->selector = GDT_SELECTOR(KTEXT_DES);
 
                 d->present = 1;
@@ -291 +291 @@
          * to its own TSS. We just need to load the TR register.
          */
-        tr_load(gdtselector(TSS_DES));
+        tr_load(GDT_SELECTOR(TSS_DES));
 }