X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmem.c;h=7bfb8aaff997ac9f2cb1ef77f98c9a44a21766c7;hb=091d8b1fcfc3a766f6603d4c1c69d9f8f4bf3031;hp=904ae8b8159dc6a18c5e4643874bd93f0ad2d23a;hpb=10d90467d53345f6b3c1ec575f34266253858333;p=palacios.releases.git

diff --git a/palacios/src/geekos/mem.c b/palacios/src/geekos/mem.c
index 904ae8b..7bfb8aa 100644
--- a/palacios/src/geekos/mem.c
+++ b/palacios/src/geekos/mem.c
@@ -2,7 +2,9 @@
  * Physical memory allocation
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
- * $Revision: 1.10 $
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org>
+ * $Revision: 1.13 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -211,10 +213,10 @@ void Init_Mem(struct Boot_Info* bootInfo)
     initrdAddr = vmmMemEnd;
     initrdEnd = Round_Up_To_Page(initrdAddr + s_ramdiskSize);
     PrintBoth("mem.c(%d) Move ramdisk(%dB) from %x to %x", __LINE__, s_ramdiskSize, g_ramdiskImage, initrdAddr);
-    memcpy(initrdAddr, g_ramdiskImage, s_ramdiskSize);
+    memcpy((ulong_t *)initrdAddr, (ulong_t *)g_ramdiskImage, s_ramdiskSize);
     PrintBoth(" done\n");
     PrintBoth("mem.c(%d) Set 0 to unused bytes in the last ramdisk page from %x to %x", __LINE__, initrdAddr+s_ramdiskSize, initrdEnd);
-    memset(initrdAddr+s_ramdiskSize, 0, initrdEnd-(initrdAddr+s_ramdiskSize));
+    memset((ulong_t *)initrdAddr+s_ramdiskSize, 0, initrdEnd-(initrdAddr+s_ramdiskSize));
     PrintBoth(" done\n");
     /*
      * Zheng 08/03/2008