diff --git a/TODO b/TODO index bb8c199..e74439b 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,7 @@ TODO [x] Paging [x] Serial monitor [ ] Make dedicated asm functions like lidt(), sti(), ... +[ ] Add something like in the kernel [x] PIT [ ] RTC [ ] HPET diff --git a/kernel/src/kmalloc.c b/kernel/src/kmalloc.c index 1da7d71..062c591 100644 --- a/kernel/src/kmalloc.c +++ b/kernel/src/kmalloc.c @@ -59,7 +59,7 @@ void kmalloc_merge() { if (current->free && current->next->free) { current->size += current->next->size + sizeof(struct kmalloc_node); current->next = current->next->next; - break; + continue; } current = current->next;