diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-02-02 10:31:51 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-02-02 10:31:51 -0500 |
| commit | 95f52a55ad556d956c483abfc28a11603b75f4a8 (patch) | |
| tree | 210868e9cc62b47c0941cddc836c1f2212d8ff6f /src/memory/virtalloc.c | |
| parent | merge virtnodes on alloc (diff) | |
| download | corn-95f52a55ad556d956c483abfc28a11603b75f4a8.tar.gz corn-95f52a55ad556d956c483abfc28a11603b75f4a8.tar.bz2 corn-95f52a55ad556d956c483abfc28a11603b75f4a8.zip | |
better print and mem
Diffstat (limited to 'src/memory/virtalloc.c')
| -rw-r--r-- | src/memory/virtalloc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/memory/virtalloc.c b/src/memory/virtalloc.c index f59e8e3..a1d7294 100644 --- a/src/memory/virtalloc.c +++ b/src/memory/virtalloc.c @@ -129,13 +129,9 @@ static void merge_back(struct addr_node *node) { } static void merge_forward(struct addr_node *node) { -<<<<<<< HEAD - while (node->next && !node->is_alloc) { -======= while(node->next) { if (node->is_alloc != node->next->is_alloc) break; ->>>>>>> ea2de5a (looping kalloc can allocate all of memory (sometimes) :3) struct addr_node *temp = node->next; node->end = temp->end; node->next = temp->next; |