rename vm_branch to vmem

+ Closer to what it's for rather than what it is.

1 files changed, 11 insertions, 12 deletions

diff --git a/include/arch/vmem.h b/include/arch/vmem.h
index 5197c67..03bffb3 100644
--- a/include/arch/vmem.h
+++ b/include/arch/vmem.h
@@ -3,28 +3,27 @@
 
 #include <vmem.h>
 
-stat_t map_vpage(struct vm_branch *branch, pm_t paddr, vm_t vaddr,
-                 vmflags_t flags, enum mm_order order);
+stat_t map_vpage(struct vmem *branch, pm_t paddr, vm_t vaddr, vmflags_t flags,
+                 enum mm_order order);
 
-stat_t unmap_vpage(struct vm_branch *branch, vm_t vaddr);
+stat_t unmap_vpage(struct vmem *branch, vm_t vaddr);
 
-stat_t mod_vpage(struct vm_branch *branch, vm_t vaddr, pm_t paddr,
-                 vmflags_t flags);
-stat_t stat_vpage(struct vm_branch *branch, vm_t vaddr, pm_t *paddr,
+stat_t mod_vpage(struct vmem *branch, vm_t vaddr, pm_t paddr, vmflags_t flags);
+stat_t stat_vpage(struct vmem *branch, vm_t vaddr, pm_t *paddr,
                   enum mm_order *order, vmflags_t *flags);
 
 void flush_tlb();
 void flush_tlb_all();
 
-stat_t populate_kvmem(struct vm_branch *b);
-struct vm_branch *init_vmem(void *fdt);
+stat_t populate_kvmem(struct vmem *b);
+struct vmem *init_vmem(void *fdt);
 
 #if defined(DEBUG)
-vm_t setup_kernel_io(struct vm_branch *b, vm_t paddr);
+vm_t setup_kernel_io(struct vmem *b, vm_t paddr);
 #endif
 
-struct vm_branch *create_vmem();
-stat_t destroy_vmem(struct vm_branch *);
-stat_t clone_uvmem(struct vm_branch *, struct vm_branch *);
+struct vmem *create_vmem();
+stat_t destroy_vmem(struct vmem *);
+stat_t clone_uvmem(struct vmem *, struct vmem *);
 
 #endif /* APOS_ARCH_PAGES_H */