Changeset efedee77 in mainline for kernel/arch/ia32/src/boot/vesa_ret.inc

Timestamp:

2010-11-02T22:38:46Z (14 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/ia32/src/boot/vesa_ret.inc (modified) (2 diffs)

kernel/arch/ia32/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, %fs
@@ -14 +14 @@
         movw %cx, %ss
         
-        jmpl $gdtselector(KTEXT_DES), $vesa_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT_DES), $vesa_meeting_point