diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-02-02 10:11:55 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-02-02 10:13:33 -0500 |
| commit | 179ddf64c19196f9333dc637408b35ecbbe17034 (patch) | |
| tree | f10de95bf31218ea26d3895dc35c23a553363174 /src | |
| parent | looping kalloc can allocate all of memory (sometimes) :3 (diff) | |
| download | corn-179ddf64c19196f9333dc637408b35ecbbe17034.tar.gz corn-179ddf64c19196f9333dc637408b35ecbbe17034.tar.bz2 corn-179ddf64c19196f9333dc637408b35ecbbe17034.zip | |
merge virtnodes on alloc
Diffstat (limited to '')
| -rw-r--r-- | src/memory/virtalloc.c | 9 |
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; } } |