Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision 8d6bc2d55a5723b035ceb3586ac601c79ece9e54)
+++ generic/include/mm/as.h	(revision baafe7129927f6fcfc81c0942b4cae0a700500cb)
@@ -77,5 +77,5 @@
 
 	/** Number of processors on wich is this address space active. */
-	count_t refcount;
+	count_t cpu_refcount;
 
 	/** B+tree of address space areas. */
@@ -135,5 +135,5 @@
 extern as_operations_t *as_operations;
 
-extern spinlock_t as_lock;
+extern spinlock_t inactive_as_with_asid_lock;
 extern link_t inactive_as_with_asid_head;