Index: kernel/genarch/src/mm/asid.c
===================================================================
--- kernel/genarch/src/mm/asid.c	(revision e3ce39ba96f14df6f6296db22ceb59a967b71733)
+++ kernel/genarch/src/mm/asid.c	(revision 4acaa7c0d4fdaf4f08ad44578e5a437a7f8dc98f)
@@ -70,6 +70,5 @@
 /** Allocate free address space identifier.
  *
- * Interrupts must be disabled and inactive_as_with_asid_lock must be held
- * prior to this call
+ * Interrupts must be disabled and asidlock must be held prior to this call
  *
  * @return New ASID.
@@ -80,4 +79,7 @@
 	link_t *tmp;
 	as_t *as;
+
+	ASSERT(interrupts_disabled());
+	ASSERT(spinlock_locked(&asidlock));
 
 	/*
Index: kernel/genarch/src/mm/page_ht.c
===================================================================
--- kernel/genarch/src/mm/page_ht.c	(revision e3ce39ba96f14df6f6296db22ceb59a967b71733)
+++ kernel/genarch/src/mm/page_ht.c	(revision 4acaa7c0d4fdaf4f08ad44578e5a437a7f8dc98f)
@@ -186,4 +186,7 @@
 		page = ALIGN_DOWN(page, PAGE_SIZE)
 	};
+
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
 	
 	if (!hash_table_find(&page_ht, key)) {
@@ -226,4 +229,7 @@
 		page = ALIGN_DOWN(page, PAGE_SIZE)
 	};
+
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
 	
 	/*
@@ -253,4 +259,7 @@
 		page = ALIGN_DOWN(page, PAGE_SIZE)
 	};
+
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
 	
 	link_t *cur = hash_table_find(&page_ht, key);
Index: kernel/genarch/src/mm/page_pt.c
===================================================================
--- kernel/genarch/src/mm/page_pt.c	(revision e3ce39ba96f14df6f6296db22ceb59a967b71733)
+++ kernel/genarch/src/mm/page_pt.c	(revision 4acaa7c0d4fdaf4f08ad44578e5a437a7f8dc98f)
@@ -73,4 +73,7 @@
 {
 	pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
+
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
 	
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -121,4 +124,7 @@
 void pt_mapping_remove(as_t *as, uintptr_t page)
 {
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
+
 	/*
 	 * First, remove the mapping, if it exists.
@@ -251,4 +257,7 @@
 pte_t *pt_mapping_find(as_t *as, uintptr_t page)
 {
+	ASSERT(interrupts_disabled());
+	ASSERT(page_table_locked(as));
+
 	pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)