Changeset 20235a3 in mainline for kernel/arch/ia32/src/boot/vesa_real.inc

Timestamp:

2010-09-02T20:55:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (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_real.inc (modified) (2 diffs)

kernel/arch/ia32/src/boot/vesa_real.inc

@@ -30 +30 @@
 .code32
 vesa_init:
-        jmp $gdtselector(VESA_INIT_DES), $vesa_init_real - vesa_init
+        jmp $GDT_SELECTOR(VESA_INIT_DES), $vesa_init_real - vesa_init
 
 .code16
@@ -335 +335 @@
                 vesa_leave_real2:
                 
-                        ljmpl $gdtselector(KTEXT32_DES), $(vesa_init_protected - vesa_init + VESA_INIT_SEGMENT << 4)
+                        ljmpl $GDT_SELECTOR(KTEXT32_DES), $(vesa_init_protected - vesa_init + VESA_INIT_SEGMENT << 4)
         
         no_mode: