diff options
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; |