Index: generic/src/mm/page.c
===================================================================
--- generic/src/mm/page.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ generic/src/mm/page.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -28,6 +28,8 @@
 
 #include <mm/page.h>
+#include <arch/mm/page.h>
+#include <arch/mm/asid.h>
+#include <mm/asid.h>
 #include <mm/frame.h>
-#include <arch/mm/page.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -35,4 +37,5 @@
 #include <memstr.h>
 #include <debug.h>
+#include <arch.h>
 
 /** Virtual operations for page subsystem. */
@@ -42,5 +45,5 @@
 {
 	page_arch_init();
-	page_mapping_insert(0x0, 0x0, PAGE_NOT_PRESENT, 0);
+	page_mapping_insert(0x0, 0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -62,5 +65,5 @@
 
 	for (i = 0; i < cnt; i++)
-		page_mapping_insert(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+		page_mapping_insert(s + i*PAGE_SIZE, ASID_KERNEL, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -72,14 +75,15 @@
  *
  * @param page Virtual address of the page to be mapped.
+ * @param asid Address space to wich page belongs.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
  * @param root Explicit PTL0 address.
  */
-void page_mapping_insert(__address page, __address frame, int flags, __address root)
+void page_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
 {
 	ASSERT(page_operations);
 	ASSERT(page_operations->mapping_insert);
 	
-	page_operations->mapping_insert(page, frame, flags, root);
+	page_operations->mapping_insert(page, asid, frame, flags, root);
 }
 
@@ -89,13 +93,14 @@
  *
  * @param page Virtual page.
+ * @param asid Address space to wich page belongs.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *page_mapping_find(__address page, __address root)
+pte_t *page_mapping_find(__address page,  asid_t asid, __address root)
 {
 	ASSERT(page_operations);
 	ASSERT(page_operations->mapping_find);
 
-	return page_operations->mapping_find(page, root);
+	return page_operations->mapping_find(page, asid, root);
 }
Index: generic/src/mm/vm.c
===================================================================
--- generic/src/mm/vm.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ generic/src/mm/vm.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -163,5 +163,5 @@
 	ASSERT(m->ptl0);
 	for (i=0; i<a->size; i++)
-		page_mapping_insert(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
+		page_mapping_insert(a->address + i*PAGE_SIZE, m->asid, a->mapping[i], flags, (__address) m->ptl0);
 		
 	spinlock_unlock(&a->lock);
@@ -181,5 +181,5 @@
 	ASSERT(m->ptl0);
 	for (i=0; i<a->size; i++)		
-		page_mapping_insert(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
+		page_mapping_insert(a->address + i*PAGE_SIZE, 0, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
 	
 	spinlock_unlock(&a->lock);