Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 399ece9c3b29b6d480351f5f7c2b34f9a4ac3286)
+++ kernel/generic/include/mm/as.h	(revision 879585a3fd47daccb6ab751ad240297f65de5bae)
@@ -90,4 +90,15 @@
 		/** Protected by asidlock. */
 		link_t inactive_as_with_asid_link;
+		/**
+		 * Number of processors on wich is this address space active.
+		 * Protected by asidlock.
+		 */
+		count_t cpu_refcount;
+		/**
+		 * Address space identifier.
+		 * Constant on architectures that do not support ASIDs.
+		 * Protected by asidlock.  
+		 */
+		asid_t asid;
 		
 		mutex_t lock;
@@ -96,15 +107,6 @@
 		count_t refcount;
 		
-		/** Number of processors on wich is this address space active. */
-		count_t cpu_refcount;
-		
 		/** B+tree of address space areas. */
 		btree_t as_area_btree;
-		
-		/**
-		 *  Address space identifier.
-		 *  Constant on architectures that do not support ASIDs.
-		 */
-		asid_t asid;
 		
 		/** Non-generic content. */
@@ -134,4 +136,15 @@
 	/** Protected by asidlock. */
 	link_t inactive_as_with_asid_link;
+	/**
+	 * Number of processors on wich is this address space active.
+	 * Protected by asidlock.
+	 */
+	count_t cpu_refcount;
+	/**
+	 * Address space identifier.
+	 * Constant on architectures that do not support ASIDs.
+	 * Protected by asidlock.
+	 */
+	asid_t asid;
 
 	mutex_t lock;
@@ -140,15 +153,6 @@
 	count_t refcount;
 
-	/** Number of processors on wich is this address space active. */
-	count_t cpu_refcount;
-
 	/** B+tree of address space areas. */
 	btree_t as_area_btree;
-	
-	/**
-	 *  Address space identifier.
-	 *  Constant on architectures that do not support ASIDs.
-	 */
-	asid_t asid;
 	
 	/** Non-generic content. */
@@ -250,5 +254,4 @@
 #endif
 
-SPINLOCK_EXTERN(inactive_as_with_asid_lock);
 extern link_t inactive_as_with_asid_head;