Index: kernel/genarch/src/mm/asid.c
===================================================================
--- kernel/genarch/src/mm/asid.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/genarch/src/mm/asid.c	(revision 0ac99db3cfe5485b8b7db65da7c3aaa474443d22)
@@ -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));
 
 	/*