From 179ddf64c19196f9333dc637408b35ecbbe17034 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 2 Feb 2024 10:11:55 -0500 Subject: [PATCH] merge virtnodes on alloc --- src/memory/virtalloc.c | 9 ++++----- 1 file 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; } }