Unused.
Signed-off-by: Barret Rhoden <[email protected]>
---
kern/include/env.h | 4 ----
kern/src/elf.c | 5 +----
kern/src/process.c | 1 -
kern/src/syscall.c | 1 -
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/kern/include/env.h b/kern/include/env.h
index fe7907753532..e1270ed9ab07 100644
--- a/kern/include/env.h
+++ b/kern/include/env.h
@@ -69,10 +69,6 @@ struct proc {
uint8_t* cache_colors_map;
size_t next_cache_color;
- /* Keeps track of this process's current memory allocation
- * (i.e. its heap pointer) */
- void *heap_top;
-
/* The args_base pointer is a user pointer which points to the base of
* the executable boot block (where args, environment, aux vectors, ...)
* are stored.
diff --git a/kern/src/elf.c b/kern/src/elf.c
index 3f3afe7afcb3..6bd1d0c37de3 100644
--- a/kern/src/elf.c
+++ b/kern/src/elf.c
@@ -394,10 +394,7 @@ int load_elf(struct proc* p, struct file* f,
uintptr_t core0_entry = ei.dynamic ? interp_ei.entry : ei.entry;
proc_init_ctx(&p->scp_ctx, 0, core0_entry, stack_top, 0);
- /* Set the heap bottom and top to just past where the text region has
been
- * loaded. */
- p->heap_top = (void*)ei.highest_addr;
- p->procinfo->heap_bottom = p->heap_top;
+ p->procinfo->heap_bottom = (void*)ei.highest_addr;
p->args_base = (void *) stack_top;
return 0;
diff --git a/kern/src/process.c b/kern/src/process.c
index c5c0c5ced21e..4402411d5627 100644
--- a/kern/src/process.c
+++ b/kern/src/process.c
@@ -373,7 +373,6 @@ error_t proc_alloc(struct proc **pp, struct proc *parent,
int flags)
cv_init(&p->child_wait);
p->state = PROC_CREATED; /* shouldn't go through state machine for init
*/
p->env_flags = 0;
- p->heap_top = 0;
spinlock_init(&p->vmr_lock);
spinlock_init(&p->pte_lock);
TAILQ_INIT(&p->vm_regions); /* could init this in the slab */
diff --git a/kern/src/syscall.c b/kern/src/syscall.c
index 999d118e48b0..f5ee65894e6e 100644
--- a/kern/src/syscall.c
+++ b/kern/src/syscall.c
@@ -836,7 +836,6 @@ static ssize_t sys_fork(env_t* e)
switch_back(env, temp);
/* Copy some state from the original proc into the new proc. */
- env->heap_top = e->heap_top;
env->env_flags = e->env_flags;
inherit_strace(e, env);
--
2.8.0.rc3.226.g39d4020
--
You received this message because you are subscribed to the Google Groups
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
For more options, visit https://groups.google.com/d/optout.
