fix: PS/2 keyboard initialization sequence

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

diff --git a/lunaix-os/kernel/mm/pmm.c b/lunaix-os/kernel/mm/pmm.c
index 9c0d3eb44272bda83e4fbe931408261a6801ba75..91f5460ab175680273ccb5e8082ce979dcc09188 100644 (file)
--- a/lunaix-os/kernel/mm/pmm.c
+++ b/lunaix-os/kernel/mm/pmm.c
@@ -43,7 +43,7 @@ pmm_mark_chunk_occupied(pid_t owner,
 // 我们跳过位于0x0的页。我们不希望空指针是指向一个有效的内存空间。
 #define LOOKUP_START 1
 
 // 我们跳过位于0x0的页。我们不希望空指针是指向一个有效的内存空间。
 #define LOOKUP_START 1
 

-size_t pg_lookup_ptr;
+volatile size_t pg_lookup_ptr;

 
 void
 pmm_init(uintptr_t mem_upper_lim)
 
 void
 pmm_init(uintptr_t mem_upper_lim)


@@ -66,10 +66,10 @@ pmm_alloc_cpage(pid_t owner, size_t num_pages, pp_attr_t attr)
     size_t p2 = 0;
 
     while (p2 < max_pg && p2 - p1 < num_pages) {
     size_t p2 = 0;
 
     while (p2 < max_pg && p2 - p1 < num_pages) {

-        (!(&pm_table[p2])->ref_counts) ? (p2++) : (p1 = p2);
+        (!(&pm_table[p2])->ref_counts) ? (p2++) : (p1 = ++p2);

     }
 
     }
 

-    if (p2 < max_pg) {
+    if (p2 == max_pg && p2 - p1 < num_pages) {

         return NULL;
     }
 
         return NULL;
     }