From d28f705ee3b1c850e41b165bfb966572f0c6a815 Mon Sep 17 00:00:00 2001 From: Michael Foiani Date: Tue, 14 May 2024 23:12:24 -0400 Subject: small fixes and add locks --- kernel/vm/vmmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'kernel/vm/vmmap.c') diff --git a/kernel/vm/vmmap.c b/kernel/vm/vmmap.c index 34dfaa5..ad95d33 100644 --- a/kernel/vm/vmmap.c +++ b/kernel/vm/vmmap.c @@ -201,7 +201,6 @@ ssize_t vmmap_find_range(vmmap_t *map, size_t npages, int dir) // if the range exists, return the start if (contig_page == npages) { - KASSERT(start_page >= ADDR_TO_PN(USER_MEM_LOW)); return start_page; } } @@ -231,7 +230,6 @@ ssize_t vmmap_find_range(vmmap_t *map, size_t npages, int dir) // if there are n contiguous pages, return the current vfn if (contig == npages) { - KASSERT(vfn >= ADDR_TO_PN(USER_MEM_LOW)); return vfn; } } @@ -301,6 +299,8 @@ vmmap_t *vmmap_clone(vmmap_t *map) { // NOT_YET_IMPLEMENTED("VM: vmmap_clone"); + vmmap_collapse(map); + // Create a new vmmap vmmap_t *new_vmmap = vmmap_create(); if (new_vmmap == NULL) @@ -308,8 +308,6 @@ vmmap_t *vmmap_clone(vmmap_t *map) return NULL; } - vmmap_collapse(map); - // Iterate over the list of vmareas list_iterate(&map->vmm_list, vma, vmarea_t, vma_plink) { -- cgit v1.2.3-70-g09d2