Index: genarch/src/acpi/acpi.c
===================================================================
--- genarch/src/acpi/acpi.c	(revision 6d7ffa6500ff049f534738d13b952fc159242a8d)
+++ 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 6d7ffa6500ff049f534738d13b952fc159242a8d)
+++ 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 6d7ffa6500ff049f534738d13b952fc159242a8d)
+++ 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;