Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / kernel / mm / pmalloc_simple.c

diff --git a/lunaix-os/kernel/mm/pmalloc_simple.c b/lunaix-os/kernel/mm/pmalloc_simple.c
index 37a720b8c05a3b39d417160fe305f506a8af968c..868c4701db79365e8f27f1266239e286f1aa61a5 100644 (file)
--- a/lunaix-os/kernel/mm/pmalloc_simple.c
+++ b/lunaix-os/kernel/mm/pmalloc_simple.c
@@ -1,23 +1,23 @@
 #include <lunaix/spike.h>
 #include "pmm_internal.h"
 
-#ifdef CONFIG_PMALLOC_SIMPLE
+#ifdef CONFIG_PMALLOC_METHOD_SIMPLE
 
 // Simple PM Allocator (segregated next fit)
 
 #define INIT_FLAG   0b10
 
 static const int po_limit[] = {
-    CONFIG_PMALLOC_SIMPLE_PO0_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO1_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO2_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO3_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO4_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO5_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO6_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO7_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO8_THRES,
-    CONFIG_PMALLOC_SIMPLE_PO9_THRES,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO0,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO1,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO2,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO3,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO4,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO5,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO6,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO7,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO8,
+    CONFIG_PMALLOC_SIMPLE_MAX_PO9,
 };
 
 static inline bool
@@ -162,7 +162,8 @@ pmm_alloc_napot_type(int pool, size_t order, ppage_type_t type)
 }
 
 bool
-pmm_allocator_trymark_onhold(struct pmem_pool* pool, struct ppage* start, struct ppage* end)
+pmm_allocator_trymark_onhold(struct pmem_pool* pool, 
+                             struct ppage* start, struct ppage* end)
 {
     while (start <= end) {
         if (__uninitialized_page(start)) {
@@ -188,7 +189,8 @@ pmm_allocator_trymark_onhold(struct pmem_pool* pool, struct ppage* start, struct
 }
 
 bool
-pmm_allocator_trymark_unhold(struct pmem_pool* pool, struct ppage* start, struct ppage* end)
+pmm_allocator_trymark_unhold(struct pmem_pool* pool, 
+                             struct ppage* start, struct ppage* end)
 {
     while (start <= end) {
         if (!__uninitialized_page(start) && reserved_page(start)) {