Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 481d47513438cdc33d95733bb4dadfbb80b196ef)
+++ kernel/generic/src/mm/as.c	(revision 568db0fa9731edee5774d4965f5840e413666d76)
@@ -200,4 +200,5 @@
 	DEADLOCK_PROBE_INIT(p_asidlock);
 
+	ASSERT(as != AS);
 	ASSERT(atomic_get(&as->refcount) == 0);
 	
@@ -225,5 +226,5 @@
 	preemption_enable();	/* Interrupts disabled, enable preemption */
 	if (as->asid != ASID_INVALID && as != AS_KERNEL) {
-		if (as != AS && as->cpu_refcount == 0)
+		if (as->cpu_refcount == 0)
 			list_remove(&as->inactive_as_with_asid_link);
 		asid_put(as->asid);