Changes in kernel/arch/amd64/src/boot/multiboot.S [4bf0926e:36df4109] in mainline

File:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (4 diffs)

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

@@ -430 +430 @@
         movl multiboot_eax, %edi
         movl multiboot_ebx, %esi
-        
-#ifdef MEMORY_MODEL_large
-        movabsq $amd64_pre_main, %rax
-        callq *%rax
-#else
         callq amd64_pre_main
-#endif
-        
+
         long_status $status_main
         
         /* Call main_bsp() */
-#ifdef MEMORY_MODEL_large
-        movabsq $main_bsp, %rax
-        callq *%rax
-#else
-        callq main_bsp
-#endif
+        callq main_bsp 
         
         /* Not reached */
@@ -633 +622 @@
         ptl2gen 512 7
 
-#ifdef MEMORY_MODEL_kernel
 .align 4096
 ptl_1:
@@ -650 +638 @@
         .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
 
+
 .align 4096
 SYMBOL(ptl_0)
@@ -655 +644 @@
         .fill 510, 8, 0
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-#endif
-
-#ifdef MEMORY_MODEL_large
-.align 4096
-ptl_1:
-        /* Identity mapping for [0; 8G) */
-        .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_2g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_3g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_4g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_5g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_6g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_7g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 504, 8, 0
-
-.align 4096
-SYMBOL(ptl_0)
-        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
-        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
-#endif
 
 .section K_DATA_START, "aw", @progbits