summaryrefslogtreecommitdiff
path: root/src/memory/virtalloc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/memory/virtalloc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/memory/virtalloc.c b/src/memory/virtalloc.c
index bfeb670..f59e8e3 100644
--- a/src/memory/virtalloc.c
+++ b/src/memory/virtalloc.c
@@ -173,11 +173,10 @@ void *virtaddr_alloc(int n_pages) {
new->is_alloc = true;
new->is_used = true;
new->next = node;
- return (void*)new->start;
- //void *mem = (void *) new->start;
- //merge_back(new);
- //merge_forward(new);
- //return mem;
+ void *mem = (void *) new->start;
+ merge_back(new);
+ merge_forward(new);
+ return mem;
}
}