Changeset d1e580a in mainline for kernel/arch/amd64/src/boot/multiboot.S

Timestamp:

2012-07-29T03:07:52Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

10334c2e

Parents:

d7c8e39f (diff), b2ba418 (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/amd64/src/boot/multiboot.S (modified) (3 diffs)

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

@@ -76 +76 @@
 
 multiboot_image_start:
+        cli
         cld
         
@@ -81 +82 @@
         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 */
@@ -645 +650 @@
 .section K_DATA_START, "aw", @progbits
 
+.global bootstrap_idtr
+bootstrap_idtr:
+        .word 0
+        .long 0
+
 .global bootstrap_gdtr
 bootstrap_gdtr: