Index: kernel/generic/src/synch/futex.c
===================================================================
--- kernel/generic/src/synch/futex.c	(revision e367939cb9b0dd524632e74c1ac4bd5acb315e5a)
+++ kernel/generic/src/synch/futex.c	(revision 759ea0d4a36cb6f7089767643dd0afd7ed4e7586)
@@ -288,6 +288,6 @@
 static bool find_futex_paddr(uintptr_t uaddr, uintptr_t *paddr)
 {
+	page_table_lock(AS, false);
 	spinlock_lock(&futex_ht_lock);
-	page_table_lock(AS, false);
 
 	bool found = false;
@@ -299,6 +299,6 @@
 	}
 	
+	spinlock_unlock(&futex_ht_lock);
 	page_table_unlock(AS, false);
-	spinlock_unlock(&futex_ht_lock);
 	
 	return found;