Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision ada559c5e94ba58f9ea3b263de2877127eba8873)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision a820bf7a37ab31617197fc58a855210633e30b42)
@@ -51,6 +51,5 @@
  *
  * Try to find PTE for faulting address.
- * The as->lock must be held on entry to this function
- * if lock is true.
+ * The as->lock must be held on entry to this function.
  *
  * @param as       Address space.
@@ -65,6 +64,6 @@
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr,
-    int access, istate_t *istate, int *pfrc)
+static pte_t *find_mapping_and_check(as_t *as, uintptr_t badvaddr, int access,
+    istate_t *istate, int *pfrc)
 {
 	/*
@@ -83,5 +82,5 @@
 		 * Resort to higher-level page fault handler.
 		 */
-		page_table_unlock(as, lock);
+		page_table_unlock(as, true);
 		
 		int rc = as_page_fault(badvaddr, access, istate);
@@ -92,5 +91,5 @@
 			 * The mapping ought to be in place.
 			 */
-			page_table_lock(as, lock);
+			page_table_lock(as, true);
 			pte = page_mapping_find(as, badvaddr);
 			ASSERT((pte) && (pte->present));
@@ -98,9 +97,9 @@
 			return pte;
 		case AS_PF_DEFER:
-			page_table_lock(as, lock);
+			page_table_lock(as, true);
 			*pfrc = rc;
 			return NULL;
 		case AS_PF_FAULT:
-			page_table_lock(as, lock);
+			page_table_lock(as, true);
 			*pfrc = rc;
 			return NULL;
@@ -213,15 +212,5 @@
 void pht_refill(int n, istate_t *istate)
 {
-	as_t *as;
-	bool lock;
-	
-	if (AS == NULL) {
-		as = AS_KERNEL;
-		lock = false;
-	} else {
-		as = AS;
-		lock = true;
-	}
-	
+	as_t *as = (AS == NULL) ? AS_KERNEL : AS;
 	uintptr_t badvaddr;
 	
@@ -231,8 +220,8 @@
 		badvaddr = istate->pc;
 	
-	page_table_lock(as, lock);
+	page_table_lock(as, true);
 	
 	int pfrc;
-	pte_t *pte = find_mapping_and_check(as, lock, badvaddr,
+	pte_t *pte = find_mapping_and_check(as, badvaddr,
 	    PF_ACCESS_READ /* FIXME */, istate, &pfrc);
 	
@@ -247,5 +236,5 @@
 			 * or copy_to_uspace().
 			 */
-			page_table_unlock(as, lock);
+			page_table_unlock(as, true);
 			return;
 		default:
@@ -258,9 +247,9 @@
 	pht_insert(badvaddr, pte);
 	
-	page_table_unlock(as, lock);
+	page_table_unlock(as, true);
 	return;
 	
 fail:
-	page_table_unlock(as, lock);
+	page_table_unlock(as, true);
 	pht_refill_fail(badvaddr, istate);
 }