From 68b6a77a6584f0acbf3334663ea44cdca97f1427 Mon Sep 17 00:00:00 2001
From: pjht <terppa05@gmail.com>
Date: Mon, 6 May 2019 08:38:02 -0500
Subject: [PATCH] Fix warnings

---
 cpu/i386/address_spaces.c |  2 +-
 kernel/kernel.c           | 22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/cpu/i386/address_spaces.c b/cpu/i386/address_spaces.c
index 145450a..8b4f420 100644
--- a/cpu/i386/address_spaces.c
+++ b/cpu/i386/address_spaces.c
@@ -4,7 +4,7 @@ void address_spaces_copy_data(void* cr3, void* data,uint32_t size,void* virt_add
   uint32_t old_cr3;
   asm volatile("movl %%cr3, %%eax; movl %%eax, %0;":"=m"(old_cr3)::"%eax");
   void* phys_addr=virt_to_phys(data);
-  load_address_space(cr3);
+  load_address_space((uint32_t)cr3);
   map_pages(virt_addr,phys_addr,(size/4096)+1,1,1);
   load_address_space(old_cr3);
 }
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 5b27597..10d5075 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,23 +1,13 @@
-#include "../cpu/cpu_init.h"
-#include "../drivers/vga.h"
-// #include "../drivers/pci.h"
-// #include "../drivers/serial.h"
-// #include "../cpu/i386/ports.h"
-// #include "vfs.h"
-// #include "../fs/devfs.h"
-// #include "../fs/initrd.h"
 #include <grub/text_fb_info.h>
 #include <stdlib.h>
-// #include <tasking.h>
+#include <tasking.h>
 #include <string.h>
 #include <memory.h>
 #include <grub/multiboot2.h>
-// #include "klog.h"
-#include "elf.h"
-// #include <errno.h>
-// #include "../drivers/ide.h"
-// #include "parts.h"
 #include <stdint.h>
+#include "../cpu/cpu_init.h"
+#include "../drivers/vga.h"
+#include "elf.h"
 
 static long initrd_sz;
 static char* initrd;
@@ -112,9 +102,9 @@ void kmain(struct multiboot_boot_header_tag* hdr) {
           pos++;
         }
       }
-      copy_data(cr3,ptr,pheader.memsz,pheader.vaddr);
+      copy_data(cr3,ptr,pheader.memsz,(void*)pheader.vaddr);
     }
-    createTaskCr3(header.entry,cr3);
+    createTaskCr3((void*)header.entry,cr3);
     for(;;) {
       yield();
     }