Index: generic/src/main/kinit.c
===================================================================
--- generic/src/main/kinit.c	(revision 6a3c9a77923487a0b7ff489449084ef0796d88ef)
+++ generic/src/main/kinit.c	(revision bc504ef2f35f18a589fe5c41042fd4a533bfe7cb)
@@ -148,5 +148,5 @@
 			panic("config.init_addr is not frame aligned");
 		
-		as = as_create(NULL, 0);
+		as = as_create(0);
 		if (!as)
 			panic("as_create\n");
@@ -159,5 +159,5 @@
 		
 		/*
-		 * Create the text as_area and copy the userspace code there.
+		 * Create the text as_area and initialize its mapping.
 		 */
 		
@@ -170,5 +170,8 @@
 		if (!a)
 			panic("as_area_create: text\n");
-		
+
+		for (i = 0; i < frames; i++)
+			as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
+
 		/*
 		 * Create the data as_area.
@@ -178,11 +181,4 @@
 			panic("as_area_create: stack\n");
 
-		/*
-		 * Initialize text area mapping.
-		 */
-		for (i = 0; i < frames; i++)
-			as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
-
-	
 		thread_ready(t);
 	}