From 3fa449276364389137a7154a9971594816d86362 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 21 Jan 2020 22:10:16 +0100
Subject: Naming scheme and page fault improvements

---
 src/kernel/memory/kheap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/kernel/memory/kheap.c')

diff --git a/src/kernel/memory/kheap.c b/src/kernel/memory/kheap.c
index def9ca2..40551bc 100644
--- a/src/kernel/memory/kheap.c
+++ b/src/kernel/memory/kheap.c
@@ -12,7 +12,7 @@ uint32_t kmalloc_int(uint32_t sz, int align, uint32_t *phys)
     if (kheap != 0) {
         void *addr = alloc(sz, (uint8_t) align, kheap);
         if (phys != 0) {
-            page_t *page = get_page((uint32_t) addr, 0, kernel_directory);
+            page_t *page = paging_get_page((uint32_t) addr, 0, kernel_directory);
             *phys = page->frame * 0x1000 + ((uint32_t) addr & 0xFFF);
         }
         return (uint32_t) addr;
@@ -70,8 +70,8 @@ static void expand(uint32_t new_size, heap_t *heap)
 
     uint32_t i = old_size;
     while (i < new_size) {
-        alloc_frame(get_page(heap->start_address + i, 1, kernel_directory),
-                    (heap->supervisor) ? 1 : 0, (heap->readonly) ? 0 : 1);
+        paging_alloc_frame(paging_get_page(heap->start_address + i, 1, kernel_directory),
+                           (heap->supervisor) ? 1 : 0, (heap->readonly) ? 0 : 1);
         i += 0x1000;
     }
     heap->end_address = heap->start_address + new_size;
@@ -92,7 +92,7 @@ static uint32_t contract(uint32_t new_size, heap_t *heap)
     uint32_t old_size = heap->end_address - heap->start_address;
     uint32_t i = old_size - 0x1000;
     while (new_size < i) {
-        free_frame(get_page(heap->start_address + i, 0, kernel_directory));
+        paging_free_frame(paging_get_page(heap->start_address + i, 0, kernel_directory));
         i -= 0x1000;
     }
 
-- 
cgit v1.2.3