Index: arch/amd64/src/mm/page.c
===================================================================
--- arch/amd64/src/mm/page.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ arch/amd64/src/mm/page.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -57,5 +57,5 @@
 		 */
 		for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-			page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+			page_mapping_insert(PA2KA(cur), 0, cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
 		}
 
Index: arch/ia32/src/drivers/ega.c
===================================================================
--- arch/ia32/src/drivers/ega.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ arch/ia32/src/drivers/ega.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -30,4 +30,5 @@
 #include <putchar.h>
 #include <mm/page.h>
+#include <mm/asid.h>
 #include <arch/mm/page.h>
 #include <synch/spinlock.h>
@@ -59,5 +60,5 @@
 	__u8 hi, lo;
 
-	page_mapping_insert(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+	page_mapping_insert(PA2KA(VIDEORAM), ASID_KERNEL, VIDEORAM, PAGE_NOT_CACHEABLE, 0);
 	outb(0x3d4,0xe);
 	hi = inb(0x3d5);
Index: arch/ia32/src/mm/page.c
===================================================================
--- arch/ia32/src/mm/page.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ arch/ia32/src/mm/page.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -32,4 +32,5 @@
 #include <mm/frame.h>
 #include <mm/page.h>
+#include <mm/asid.h>
 #include <arch/types.h>
 #include <config.h>
@@ -61,5 +62,5 @@
 		 */
 		for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
-			page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba));
+			page_mapping_insert(PA2KA(cur), ASID_KERNEL, cur, PAGE_CACHEABLE, KA2PA(dba));
 
 		exc_register(14, "page_fault", page_fault);
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ arch/ia32/src/smp/smp.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -44,4 +44,5 @@
 #include <mm/page.h>
 #include <mm/heap.h>
+#include <mm/asid.h>
 #include <print.h>
 #include <memstr.h>
@@ -64,7 +65,7 @@
 
 	if (config.cpu_count > 1) {		
-		page_mapping_insert((__address)l_apic, (__address)l_apic, 
+		page_mapping_insert((__address)l_apic, ASID_KERNEL, (__address)l_apic, 
 				  PAGE_NOT_CACHEABLE, 0);
-		page_mapping_insert((__address) io_apic,
+		page_mapping_insert((__address) io_apic, ASID_KERNEL,
 				  (__address) io_apic,
 				  PAGE_NOT_CACHEABLE, 0);
Index: arch/mips32/src/mm/tlb.c
===================================================================
--- arch/mips32/src/mm/tlb.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ arch/mips32/src/mm/tlb.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -337,5 +337,5 @@
 	 * Handler cannot succeed if badvaddr has no mapping.
 	 */
-	pte = page_mapping_find(badvaddr, 0);
+	pte = page_mapping_find(badvaddr, VM->asid, 0);
 	if (!pte) {
 		printf("No such mapping.\n");
Index: genarch/src/acpi/acpi.c
===================================================================
--- genarch/src/acpi/acpi.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ genarch/src/acpi/acpi.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -30,5 +30,5 @@
 #include <genarch/acpi/madt.h>
 #include <arch/bios/bios.h>
-
+#include <mm/asid.h>
 #include <mm/page.h>
 #include <print.h>
@@ -80,5 +80,5 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-	page_mapping_insert((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+	page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
 	map_structure((__address) sdt, sdt->length);
 }
Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ genarch/src/mm/page_ht.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -30,10 +30,11 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
 #include <arch/asm.h>
 
-static void ht_mapping_insert(__address page, __address frame, int flags, __address root);
-static pte_t *ht_mapping_find(__address page, __address root);
+static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
+static pte_t *ht_mapping_find(__address page, asid_t asid, __address root);
 
 page_operations_t page_ht_operations = {
@@ -48,9 +49,10 @@
  *
  * @param page Virtual address of the page to be mapped.
+ * @param asid Address space to which 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 ht_mapping_insert(__address page, __address frame, int flags, __address root)
+void ht_mapping_insert(__address page,  asid_t asid, __address frame, int flags, __address root)
 {
 }
@@ -61,9 +63,10 @@
  *
  * @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 *ht_mapping_find(__address page, __address root)
+pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
 {
 	return NULL;
Index: genarch/src/mm/page_pt.c
===================================================================
--- genarch/src/mm/page_pt.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ genarch/src/mm/page_pt.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -31,4 +31,5 @@
 #include <mm/frame.h>
 #include <arch/mm/page.h>
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -36,6 +37,6 @@
 #include <memstr.h>
 
-static void pt_mapping_insert(__address page, __address frame, int flags, __address root);
-static pte_t *pt_mapping_find(__address page, __address root);
+static void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
+static pte_t *pt_mapping_find(__address page, asid_t asid, __address root);
 
 page_operations_t page_pt_operations = {
@@ -50,9 +51,10 @@
  *
  * @param page Virtual address of the page to be mapped.
+ * @param asid Ignored.
  * @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 pt_mapping_insert(__address page, __address frame, int flags, __address root)
+void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -97,9 +99,10 @@
  *
  * @param page Virtual page.
+ * @param asid Ignored.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *pt_mapping_find(__address page, __address root)
+pte_t *pt_mapping_find(__address page, asid_t asid, __address root)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
Index: generic/include/mm/asid.h
===================================================================
--- generic/include/mm/asid.h	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
+++ generic/include/mm/asid.h	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __ASID_H__
+#define __ASID_H__
+
+#define ASID_KERNEL	0
+
+#endif
Index: generic/include/mm/page.h
===================================================================
--- generic/include/mm/page.h	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ generic/include/mm/page.h	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -30,4 +30,5 @@
 #define __PAGE_H__
 
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -57,6 +58,6 @@
 
 struct page_operations {
-	void (* mapping_insert)(__address page, __address frame, int flags, __address root);
-	pte_t *(* mapping_find)(__address page, __address root);
+	void (* mapping_insert)(__address page, asid_t asid, __address frame, int flags, __address root);
+	pte_t *(* mapping_find)(__address page, asid_t asid, __address root);
 };
 typedef struct page_operations page_operations_t;
@@ -65,6 +66,6 @@
 
 extern void page_init(void);
-extern void page_mapping_insert(__address page, __address frame, int flags, __address root);
-extern pte_t *page_mapping_find(__address page, __address root);
+extern void page_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
+extern pte_t *page_mapping_find(__address page, asid_t asid, __address root);
 extern void map_structure(__address s, size_t size);
 
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);
Index: test/mm/mapping1/test.c
===================================================================
--- test/mm/mapping1/test.c	(revision 59adc2b9587400d75b5f3c03ec31e2c946b96230)
+++ test/mm/mapping1/test.c	(revision 677a6d50fe04baf1fc4de579c24ea8dd8da3099b)
@@ -30,4 +30,5 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/asid.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -56,7 +57,7 @@
 	
 	printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0));
-	page_mapping_insert(PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
+	page_mapping_insert(PAGE0, ASID_KERNEL, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
 	printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1));	
-	page_mapping_insert(PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
+	page_mapping_insert(PAGE1, ASID_KERNEL, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
 	
 	printf("Value at virtual address %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0));