Index: kernel/genarch/src/mm/asid.c
===================================================================
--- kernel/genarch/src/mm/asid.c	(revision 2057572a989f56acc5c906946caebf6b2e039bda)
+++ kernel/genarch/src/mm/asid.c	(revision be66dee46e9b575874f130efde7da456c66d105d)
@@ -63,12 +63,6 @@
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
-#include <arch.h>
 #include <adt/list.h>
 #include <debug.h>
-
-/**
- * asidlock protects the asids_allocated counter.
- */
-SPINLOCK_INITIALIZE(asidlock);
 
 static count_t asids_allocated = 0;
@@ -91,5 +85,4 @@
 	 */
 	
-	spinlock_lock(&asidlock);
 	if (asids_allocated == ASIDS_ALLOCABLE) {
 
@@ -109,5 +102,4 @@
 		
 		as = list_get_instance(tmp, as_t, inactive_as_with_asid_link);
-		mutex_lock_active(&as->lock);
 
 		/*
@@ -131,6 +123,4 @@
 		as_invalidate_translation_cache(as, 0, (count_t) -1);
 		
-		mutex_unlock(&as->lock);
-
 		/*
 		 * Get the system rid of the stolen ASID.
@@ -157,6 +147,4 @@
 	}
 	
-	spinlock_unlock(&asidlock);
-	
 	return asid;
 }
@@ -171,14 +159,6 @@
 void asid_put(asid_t asid)
 {
-	ipl_t ipl;
-
-	ipl = interrupts_disable();
-	spinlock_lock(&asidlock);
-
 	asids_allocated--;
 	asid_put_arch(asid);
-	
-	spinlock_unlock(&asidlock);
-	interrupts_restore(ipl);
 }