Changeset 533e2d7 in mainline for kernel/arch/ia32/src/boot/vesa_real.inc

Timestamp:

2013-06-03T07:55:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

797d4d19

Parents:

ea15a89a (diff), 6db5d4b (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) (3 diffs)

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

@@ -31 +31 @@
 vesa_init:
         lidtl vesa_idtr
-        jmp $GDT_SELECTOR(VESA_INIT_DES), $vesa_init_real - vesa_init
+        
+        mov $GDT_SELECTOR(VESA_INIT_DATA_DES), %bx
+        
+        mov %bx, %es
+        mov %bx, %fs
+        mov %bx, %gs
+        mov %bx, %ds
+        mov %bx, %ss
+        
+        jmp $GDT_SELECTOR(VESA_INIT_CODE_DES), $vesa_init_real - vesa_init
 
 vesa_idtr:
@@ -39 +48 @@
 .code16
 vesa_init_real:
-        
         mov %cr0, %eax
         and $~1, %eax
@@ -45 +53 @@
         
         jmp $VESA_INIT_SEGMENT, $vesa_init_real2 - vesa_init
-        
+
 vesa_init_real2:
         mov $VESA_INIT_SEGMENT, %bx