From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Mon, 23 Feb 2009 05:57:24 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=335cd2faf2d617edccfbf561d03ae4cf3b178a93

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

335cd2faf2d617edccfbf561d03ae4cf3b178a93
diff --cc geekos/src/geekos/vm.c
index 7cb1acb,36b9740..fe7b44c
--- a/geekos/src/geekos/vm.c
+++ b/geekos/src/geekos/vm.c
@@@ -104,9 -104,9 +104,11 @@@ int RunVMM(struct Boot_Info * bootInfo
      
      vm_config.rombios = region_start;
      vm_config.rombios_size = rombios->length;
 +
 +    vm_config.mem_size = 128 * 1024 * 1024;
      
+     vm_config.mem_size = 128 * 1024 * 1024;
+ 
      region_start += rombios->length;
  
  #ifdef PROFILE_VMM