diff --git a/headers/memory.h b/headers/memory.h index 16c64c4..6942c8e 100644 --- a/headers/memory.h +++ b/headers/memory.h @@ -24,7 +24,7 @@ #define PDE_VBE 1021 #define PDE_FRAME_ZONES 1022 -#define PDE_MULTIBOOT 1023 +#define PDE_MULTIBOOT 1020 #define PTE2VA(pd_index, pt_index) \ ((uint32_t *)((((uint32_t)pd_index * 1024) + (uint32_t)pt_index) * \ @@ -64,7 +64,8 @@ extern multiboot_memory_map_t *mmap_addr; extern multiboot_uint32_t mmap_length; extern struct frame_zone *head; -void init_memory(multiboot_info_t *mbd, uint32_t magic); +void init_multiboot(multiboot_info_t *mbd, uint32_t magic); +void init_memory(void); void *alloc_frame(void); int free_frame(void *frame_ptr); void *kalloc_pages(size_t nb_pages);