From: Peter Dinda <pdinda@northwestern.edu>
Date: Tue, 21 Oct 2008 20:10:34 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@newskysaw.cs.northwestern.edu/home/sharedev... 
X-Git-Tag: 1.0^2~34^2^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=fac5e52e6e6f5cb160180c21e1f19c761a7dc88a;hp=1bb5fea153e1c481b48a5e657a517f80db98d066;p=palacios.git

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

diff --git a/build/Makefile b/build/Makefile
index 7217262..1cfd87d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -203,7 +203,7 @@ kitten: palacios-full
 	cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(KITTEN_TOP_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/../lib/xed/libxed32e.a $(KITTEN_TOP_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/vm_kernel $(KITTEN_TOP_DIR)/palacios/
-	(cd $(KITTEN_TOP_DIR) && make)
+	(cd $(KITTEN_TOP_DIR) && make oldconfig && make)
 
 
 geekos: 
diff --git a/kitten/.hg/dirstate b/kitten/.hg/dirstate
index 23a1d25..2d7cc7f 100644
Binary files a/kitten/.hg/dirstate and b/kitten/.hg/dirstate differ