Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision 0ff03f3a9f7a35d56bf50ddb10304d4fe756524d)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision 655f70bc5b9e0071345a88b9cbe16715a93be963)
@@ -100,6 +100,4 @@
 	mutex_unlock(&AS->lock);
 	
-	page_table_lock(AS, true);
-	
 	pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);
 	if (!pte) {
@@ -113,5 +111,4 @@
 			 * or copy_to_uspace().
 			 */
-			page_table_unlock(AS, true);
 			return;
 		default:
@@ -144,9 +141,7 @@
 	tlbwr();
 
-	page_table_unlock(AS, true);
 	return;
 	
 fail:
-	page_table_unlock(AS, true);
 	tlb_refill_fail(istate);
 }
@@ -176,6 +171,4 @@
 	index.value = cp0_index_read();
 
-	page_table_lock(AS, true);	
-	
 	/*
 	 * Fail if the entry is not in TLB.
@@ -197,5 +190,4 @@
 			 * or copy_to_uspace().
 			 */
-			page_table_unlock(AS, true);			 
 			return;
 		default:
@@ -227,9 +219,7 @@
 	tlbwi();
 
-	page_table_unlock(AS, true);
 	return;
 	
 fail:
-	page_table_unlock(AS, true);
 	tlb_invalid_fail(istate);
 }
@@ -259,6 +249,4 @@
 	index.value = cp0_index_read();
 
-	page_table_lock(AS, true);	
-	
 	/*
 	 * Fail if the entry is not in TLB.
@@ -280,5 +268,4 @@
 			 * or copy_to_uspace().
 			 */
-			page_table_unlock(AS, true);			 
 			return;
 		default:
@@ -311,9 +298,7 @@
 	tlbwi();
 
-	page_table_unlock(AS, true);
 	return;
 	
 fail:
-	page_table_unlock(AS, true);
 	tlb_modified_fail(istate);
 }
@@ -363,6 +348,4 @@
 	entry_hi_t hi;
 	pte_t *pte;
-
-	ASSERT(mutex_locked(&AS->lock));
 
 	hi.value = cp0_entry_hi_read();
@@ -393,5 +376,4 @@
 		 * Resort to higher-level page fault handler.
 		 */
-		page_table_unlock(AS, true);
 		switch (rc = as_page_fault(badvaddr, access, istate)) {
 		case AS_PF_OK:
@@ -400,5 +382,4 @@
 			 * The mapping ought to be in place.
 			 */
-			page_table_lock(AS, true);
 			pte = page_mapping_find(AS, badvaddr, true);
 			ASSERT(pte && pte->p);
@@ -407,10 +388,8 @@
 			break;
 		case AS_PF_DEFER:
-			page_table_lock(AS, true);
 			*pfrc = AS_PF_DEFER;
 			return NULL;
 			break;
 		case AS_PF_FAULT:
-			page_table_lock(AS, true);
 			*pfrc = AS_PF_FAULT;
 			return NULL;