Changes in kernel/arch/ia32/src/boot/multiboot2.S [f66c203d:36df4109] 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>
@@ -39 +40 @@
 
 .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
@@ -59 +60 @@
         
         /* Address tag */
+        .align 8
         tag_address_start:
                 .word MULTIBOOT2_TAG_ADDRESS
@@ -70 +72 @@
         
         /* Entry address tag */
+        .align 8
         tag_entry_address_start:
                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -78 +81 @@
         
         /* Flags tag */
+        .align 8
         tag_flags_start:
                 .word MULTIBOOT2_TAG_FLAGS
@@ -87 +91 @@
 #ifdef CONFIG_FB
         /* Framebuffer tag */
+        .align 8
         tag_framebuffer_start:
                 .word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -98 +103 @@
         
         /* Module alignment tag */
+        .align 8
         tag_module_align_start:
                 .word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -106 +112 @@
         
         /* Tag terminator */
+        .align 8
         tag_terminator_start:
                 .word MULTIBOOT2_TAG_TERMINATOR
@@ -113 +120 @@
 multiboot2_header_end:
 
-multiboot2_image_start:
+SYMBOL(multiboot2_image_start)
         cli
         cld
@@ -171 +178 @@
         movl %esp, %ebp
         
-        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
+        /* Call ia32_pre_main(multiboot_eax, multiboot_ebx) */
         pushl multiboot_ebx
         pushl multiboot_eax
-        call arch_pre_main
+        call ia32_pre_main
         
         /* Call main_bsp() */