Changeset efdfebc in mainline for kernel/arch/ia32/src/boot/multiboot2.S

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/multiboot2.S (modified) (2 diffs)

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

@@ -114 +114 @@
 
 multiboot2_image_start:
+        cli
         cld
         
@@ -119 +120 @@
         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 */