X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Fthreads%2Fmalloc.c;h=441ae59a0bfdaa2216c264bfaed51eeefb2d569c;hp=28f2324c79ef190d3357393546d80f5caff03546;hb=f2f8875638593bd5365cfd6a5ba7c9578e52322f;hpb=dca7bfbc436c5305ef8f0df6fbe1faba89a0012e

diff --git a/src/threads/malloc.c b/src/threads/malloc.c
index 28f2324..441ae59 100644
--- a/src/threads/malloc.c
+++ b/src/threads/malloc.c
@@ -1,11 +1,12 @@
-#include "malloc.h"
+#include "threads/malloc.h"
+#include <debug.h>
+#include <list.h>
 #include <stdint.h>
-#include "mmu.h"
-#include "palloc.h"
-#include "synch.h"
-#include "lib/debug.h"
-#include "lib/lib.h"
-#include "lib/list.h"
+#include <stdio.h>
+#include <string.h>
+#include "threads/mmu.h"
+#include "threads/palloc.h"
+#include "threads/synch.h"
 
 /* A simple implementation of malloc().
 
@@ -97,7 +98,7 @@ malloc (size_t size)
       break;
   if (d == descs + desc_cnt) 
     {
-      printk ("malloc: %zu byte allocation too big\n", size);
+      printf ("malloc: %zu byte allocation too big\n", size);
       return NULL; 
     }