Changes in kernel/arch/ia32/src/boot/multiboot2.S [36df4109:f66c203d] in mainline

File:

• kernel/arch/ia32/src/boot/multiboot2.S (modified) (11 diffs)

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

@@ -27 +27 @@
  */
 
-#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/pm.h>
@@ -40 +39 @@
 
 .align 8
+.global multiboot2_image_start
 multiboot2_header_start:
         .long MULTIBOOT2_HEADER_MAGIC
@@ -47 +47 @@
         
         /* Information request tag */
-        .align 8
         tag_info_req_start:
                 .word MULTIBOOT2_TAG_INFO_REQ
@@ -60 +59 @@
         
         /* Address tag */
-        .align 8
         tag_address_start:
                 .word MULTIBOOT2_TAG_ADDRESS
@@ -72 +70 @@
         
         /* Entry address tag */
-        .align 8
         tag_entry_address_start:
                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -81 +78 @@
         
         /* Flags tag */
-        .align 8
         tag_flags_start:
                 .word MULTIBOOT2_TAG_FLAGS
@@ -91 +87 @@
 #ifdef CONFIG_FB
         /* Framebuffer tag */
-        .align 8
         tag_framebuffer_start:
                 .word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -103 +98 @@
         
         /* Module alignment tag */
-        .align 8
         tag_module_align_start:
                 .word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -112 +106 @@
         
         /* Tag terminator */
-        .align 8
         tag_terminator_start:
                 .word MULTIBOOT2_TAG_TERMINATOR
@@ -120 +113 @@
 multiboot2_header_end:
 
-SYMBOL(multiboot2_image_start)
+multiboot2_image_start:
         cli
         cld
@@ -178 +171 @@
         movl %esp, %ebp
         
-        /* Call ia32_pre_main(multiboot_eax, multiboot_ebx) */
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
         pushl multiboot_ebx
         pushl multiboot_eax
-        call ia32_pre_main
+        call arch_pre_main
         
         /* Call main_bsp() */