diff options
| -rw-r--r-- | common/mem_regions.c | 6 | ||||
| -rw-r--r-- | common/proc.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/mem_regions.c b/common/mem_regions.c index 9f8f98e..95933d3 100644 --- a/common/mem_regions.c +++ b/common/mem_regions.c @@ -160,7 +160,7 @@ struct mem_region *find_used_region(struct mem_region_root *r, vm_t start) return 0; } -static struct mem_region *create_region(vm_t start, vm_t end, +static struct mem_region *__create_region(vm_t start, vm_t end, struct mem_region *prev, struct mem_region *next) { @@ -277,7 +277,7 @@ static vm_t __partition_region(struct mem_region_root *r, struct mem_region *m, if (pre_start != pre_end) { struct mem_region *n = - create_region(pre_start, pre_end, m->prev, m); + __create_region(pre_start, pre_end, m->prev, m); m->prev = n; if (n->prev) n->prev->next = n; @@ -287,7 +287,7 @@ static vm_t __partition_region(struct mem_region_root *r, struct mem_region *m, if (post_start != post_end) { struct mem_region *n = - create_region(post_start, post_end, m, m->next); + __create_region(post_start, post_end, m, m->next); m->next = n; if (n->next) n->next->prev = n; diff --git a/common/proc.c b/common/proc.c index 8824c5a..7721f35 100644 --- a/common/proc.c +++ b/common/proc.c @@ -6,7 +6,7 @@ #include <arch/arch.h> /* TODO: add error checking */ -static vm_t setup_call_stack(struct tcb *t, size_t bytes) +static vm_t __setup_call_stack(struct tcb *t, size_t bytes) { pm_t offset = 0; size_t pages = __pages(bytes); @@ -20,7 +20,7 @@ static vm_t setup_call_stack(struct tcb *t, size_t bytes) return PROC_STACK_TOP - BASE_PAGE_SIZE * pages; } -static vm_t setup_proc_stack(struct tcb *t, size_t bytes) +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); } @@ -44,13 +44,13 @@ stat_t init_proc(void *fdt, struct vm_branch *b) if (!t->entry) return ERR_ADDR; - t->proc_stack = setup_proc_stack(t, __proc_stack_size); + t->proc_stack = __setup_proc_stack(t, __proc_stack_size); if (!t->proc_stack) return ERR_ADDR; t->proc_stack_top = t->proc_stack + __proc_stack_size; - t->call_stack = setup_call_stack(t, __call_stack_size); + t->call_stack = __setup_call_stack(t, __call_stack_size); if (!t->call_stack) return ERR_ADDR; t->call_stack_top = t->call_stack + __call_stack_size; |