Changeset a1e98de in mainline for kernel/arch/amd64/src/boot/vesa_ret.inc

Timestamp:

2010-08-11T15:24:08Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ff586e06

Parents:

482dde7 (diff), 17ccb9d7 (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 small cleanups (no change in functionality)

File:

• kernel/arch/amd64/src/boot/vesa_ret.inc (modified) (2 diffs)

kernel/arch/amd64/src/boot/vesa_ret.inc

@@ -7 +7 @@
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %ds
@@ -17 +17 @@
          */
         
-        movw $gdtselector(UDATA_DES), %cx
+        movw $GDT_SELECTOR(UDATA_DES), %cx
         movw %cx, %fs
         movw %cx, %gs
         
-        jmpl $gdtselector(KTEXT32_DES), $vesa_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT32_DES), $vesa_meeting_point