1 files changed, 11 insertions, 11 deletions

diff --git a/common/vmem.c b/common/vmem.c
index bd0cc29..33c5dd3 100644
--- a/common/vmem.c
+++ b/common/vmem.c
@@ -1,19 +1,19 @@
 #include <apos/mem_regions.h>
 #include <apos/vmem.h>
-
+#include <arch/vmem.h>
 
 stat_t init_uvmem(struct tcb *t, vm_t base, vm_t top)
 {
 	return sp_mem_init(&t->sp_r, base, top);
 }
 
-vm_t alloc_uvmem(struct tcb *t, size_t size, uint8_t flags)
+vm_t alloc_uvmem(struct tcb *t, size_t size, vmflags_t flags)
 {
 	vm_t v = alloc_region(&t->sp_r, size, &size);
 	return map_allocd_region(t->b_r, v, size, flags);
 }
 
-vm_t alloc_fixed_uvmem(struct tcb *t, vm_t start, size_t size, uint8_t flags)
+vm_t alloc_fixed_uvmem(struct tcb *t, vm_t start, size_t size, vmflags_t flags)
 {
 	vm_t v = alloc_fixed_region(&t->sp_r, start, size, &size);
 	return map_allocd_region(t->b_r, v, size, flags);
@@ -32,27 +32,27 @@ stat_t free_uvmem(struct tcb *t, vm_t va)
 	return 0;
 }
 
-stat_t alloc_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, uint8_t flags, enum mm_order order)
+stat_t alloc_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order)
 {
 	*offset = alloc_page(order, *offset);
 	if(!*offset)
-		return 1; /* try again */
+		return MEM_REGION_TRY_AGAIN; /* try again */
 
-	map_vmem(b, *offset, vaddr, flags, order);
-	return 0;
+	map_vpage(b, *offset, vaddr, flags, order);
+	return OK;
 }
 
-stat_t free_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, uint8_t flags, enum mm_order order)
+stat_t free_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order)
 {
 	UNUSED(flags); UNUSED(offset);
 
 	pm_t paddr = 0;
 	enum mm_order v_order = 0;
-	stat_vmem(b, vaddr, &paddr, &v_order, 0);
+	stat_vpage(b, vaddr, &paddr, &v_order, 0);
 	if(order != v_order)
-		return -1;
+		return MEM_REGION_TRY_AGAIN;
 
-	unmap_vmem(b, vaddr);
+	unmap_vpage(b, vaddr);
 	free_page(order, paddr);
 	return 0;
 }