diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/debug.c | 2 | ||||
| -rw-r--r-- | common/dmem.c | 4 | ||||
| -rw-r--r-- | common/main.c | 2 | ||||
| -rw-r--r-- | common/mem_regions.c | 6 | ||||
| -rw-r--r-- | common/proc.c | 2 | ||||
| -rw-r--r-- | common/tcb.c | 2 | ||||
| -rw-r--r-- | common/vmem.c | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/common/debug.c b/common/debug.c index 43c9ae5..a008a52 100644 --- a/common/debug.c +++ b/common/debug.c @@ -23,7 +23,7 @@ void setup_dmap_dbg() setup_dbg(dbg_info.dbg_ptr, dbg_info.dev); } -void setup_io_dbg(struct vm_branch *b) +void setup_io_dbg(struct vmem *b) { vm_t io_ptr = setup_kernel_io(b, dbg_info.dbg_ptr); setup_dbg(io_ptr, dbg_info.dev); diff --git a/common/dmem.c b/common/dmem.c index 6c207c1..a116547 100644 --- a/common/dmem.c +++ b/common/dmem.c @@ -26,7 +26,7 @@ stat_t init_devmem(pm_t ram_base, pm_t ram_top) return OK; } -stat_t dev_alloc_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, +stat_t dev_alloc_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order, void *data) { stat_t *status = (stat_t *)data; @@ -36,7 +36,7 @@ stat_t dev_alloc_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, return OK; } -stat_t dev_free_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, +stat_t dev_free_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order, void *data) { UNUSED(offset); diff --git a/common/main.c b/common/main.c index 7168aeb..b2928be 100644 --- a/common/main.c +++ b/common/main.c @@ -18,7 +18,7 @@ void __main main(void *fdt) setup_arch(fdt); init_pmem(fdt); - struct vm_branch *b = init_vmem(fdt); + struct vmem *b = init_vmem(fdt); /* start up debugging in kernel IO */ setup_io_dbg(b); diff --git a/common/mem_regions.c b/common/mem_regions.c index 95933d3..e6c4644 100644 --- a/common/mem_regions.c +++ b/common/mem_regions.c @@ -161,8 +161,8 @@ struct mem_region *find_used_region(struct mem_region_root *r, vm_t start) } static struct mem_region *__create_region(vm_t start, vm_t end, - struct mem_region *prev, - struct mem_region *next) + struct mem_region *prev, + struct mem_region *next) { struct mem_region *m = get_mem_node(); m->start = start; @@ -441,7 +441,7 @@ stat_t free_known_region(struct mem_region_root *r, struct mem_region *m) * NOTE: not actually optimal, this doesn't bother to go through possible * permutations etc. which would be slow and I don't want to implement it. */ -vm_t map_fill_region(struct vm_branch *b, region_callback_t *mem_handler, +vm_t map_fill_region(struct vmem *b, region_callback_t *mem_handler, pm_t offset, vm_t start, size_t bytes, vmflags_t flags, void *data) { diff --git a/common/proc.c b/common/proc.c index 7721f35..f4c0899 100644 --- a/common/proc.c +++ b/common/proc.c @@ -25,7 +25,7 @@ static vm_t __setup_proc_stack(struct tcb *t, size_t bytes) return alloc_uvmem(t, bytes, VM_V | VM_R | VM_W | VM_U); } -stat_t init_proc(void *fdt, struct vm_branch *b) +stat_t init_proc(void *fdt, struct vmem *b) { init_tcbs(); diff --git a/common/tcb.c b/common/tcb.c index 32c31e1..1e8c648 100644 --- a/common/tcb.c +++ b/common/tcb.c @@ -101,7 +101,7 @@ struct tcb *create_proc(struct tcb *p) static stat_t __destroy_thread_data(struct tcb *t) { - /* free vm_branch */ + /* free vmem */ destroy_vmem(t->b_r); /* free associated kernel stack and the structure itself */ diff --git a/common/vmem.c b/common/vmem.c index b665491..7ea83b1 100644 --- a/common/vmem.c +++ b/common/vmem.c @@ -118,7 +118,7 @@ stat_t free_uvmem(struct tcb *t, vm_t va) return status; } -stat_t alloc_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, +stat_t alloc_uvmem_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order, void *data) { *offset = alloc_page(order, *offset); @@ -133,7 +133,7 @@ stat_t alloc_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, return (ret == INFO_SEFF) ? OK : ret; } -stat_t alloc_shared_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, +stat_t alloc_shared_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order, void *data) { if (order != MM_O0) @@ -148,7 +148,7 @@ stat_t alloc_shared_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, return (ret == INFO_SEFF) ? OK : ret; } -stat_t free_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, +stat_t free_uvmem_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order, void *data) { UNUSED(flags); |