Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / arch / x86 / mm / pmm.c

diff --git a/lunaix-os/arch/x86/mm/pmm.c b/lunaix-os/arch/x86/mm/pmm.c
index 8f350f426e90b0f7f502e4f5c8e89034f9f0db78..73f9fb16bd2a333c4028c773a2f1be7ea9450255 100644 (file)
--- a/lunaix-os/arch/x86/mm/pmm.c
+++ b/lunaix-os/arch/x86/mm/pmm.c
@@ -1,7 +1,6 @@
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pagetable.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pagetable.h>

-
-extern unsigned int __kexec_end[];
+#include <lunaix/sections.h>

 
 void
 pmm_arch_init_pool(struct pmem* memory)
 
 void
 pmm_arch_init_pool(struct pmem* memory)


@@ -12,7 +11,7 @@ pmm_arch_init_pool(struct pmem* memory)
 ptr_t
 pmm_arch_init_remap(struct pmem* memory, struct boot_handoff* bctx)
 {
 ptr_t
 pmm_arch_init_remap(struct pmem* memory, struct boot_handoff* bctx)
 {

-    size_t ppfn_total = pfn(bctx->mem.size) + 1;
+    size_t ppfn_total = pfn(bctx->mem.size);

     size_t pool_size  = ppfn_total * sizeof(struct ppage);
     
     size_t i = 0;
     size_t pool_size  = ppfn_total * sizeof(struct ppage);
     
     size_t i = 0;


@@ -30,7 +29,7 @@ restart:;
     return 0;
 
 found:;
     return 0;
 
 found:;

-    ptr_t kexec_end = to_kphysical(__kexec_end);
+    ptr_t kexec_end = to_kphysical(kernel_start);

     ptr_t aligned_pplist = MAX(ent->start, kexec_end);
 
 #ifdef CONFIG_ARCH_X86_64
     ptr_t aligned_pplist = MAX(ent->start, kexec_end);
 
 #ifdef CONFIG_ARCH_X86_64