better print and mem

2 files changed, 0 insertions, 7 deletions

diff --git a/src/memory/physalloc.c b/src/memory/physalloc.c
index b0dbdcd..3115e35 100644
--- a/src/memory/physalloc.c
+++ b/src/memory/physalloc.c
@@ -109,7 +109,6 @@ void free_phys_pages(void *ptr, int pages) {
 }
 
 static bool segment_invalid(const struct memory_segment *segment) {
-	if (segment->type != 1) return true;
 	if (segment->addr < kaddr(kernel_start)) return true;
 	if (segment->addr + segment->len < memory_start) return true;
 	if (segment->addr + segment->len < kaddr(kernel_start)) return true;
@@ -188,14 +187,12 @@ void memory_init(struct memory_map *map) {
 
 	struct memory_area *area = page_start;
 
-	kprintf("MEMORY MAP\n");
 	for (uint32_t i = 0; i < map->entry_count; i++) {
 		struct memory_segment *segment = &map->entries[i];
 
 		if (segment_invalid(segment))
 			continue;
 
-		kprintf("addr: 0x%16p\tlen: %ld\n", (void *)segment->addr, segment->len);
 
 		struct memory_area temp = segment_to_area(segment);
 		*area = temp;
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;