X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=734d9e17f2a0c368e6565bf5074a203b29d461e8;hp=e92e70d109badbcf0b7e6dae19d2181d35fae53b;hb=701de97007c8b6776998eeab78469a4304f6b871;hpb=b4963a8a43ca9103946f926e062e609e4498c2e2

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index e92e70d..734d9e1 100644
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -26,6 +26,7 @@
 #include <geekos/mem.h>
 #include <geekos/paging.h>
 #include <geekos/ide.h>
+#include <geekos/malloc.h>
 
 #include <geekos/debug.h>
 #include <geekos/vmm.h>
@@ -337,7 +338,10 @@ void Main(struct Boot_Info* bootInfo)
     os_hooks.print_trace = &SerialPrint;
     os_hooks.Allocate_Pages = &Allocate_VMM_Pages;
     os_hooks.Free_Page = &Free_VMM_Page;
-    
+    os_hooks.malloc = &VMM_Malloc;
+    os_hooks.free = &VMM_Free;
+
+
     Init_VMM(&os_hooks, &vmm_ops);