Changeset 03362fbd in mainline for kernel/arch/ia32/src/boot/multiboot.S

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/arch/ia32/src/boot/multiboot.S (modified) (3 diffs)

kernel/arch/ia32/src/boot/multiboot.S

@@ -73 +73 @@
 
 multiboot_image_start:
+        cli
         cld
         
@@ -78 +79 @@
         movl $START_STACK, %esp
         
-        /* Initialize Global Descriptor Table register */
+        /*
+         * Initialize Global Descriptor Table and
+         * Interrupt Descriptor Table registers
+         */
         lgdtl bootstrap_gdtr
+        lidtl bootstrap_idtr
         
         /* Kernel data + stack */
@@ -701 +706 @@
 page_directory:
         .space 4096, 0
+
+.global bootstrap_idtr
+bootstrap_idtr:
+        .word 0
+        .long 0
 
 .global bootstrap_gdtr