Index: kernel/arch/mips32/src/mm/as.c
===================================================================
--- kernel/arch/mips32/src/mm/as.c	(revision f619ec11294d6774460c8c5c50473bf484647d12)
+++ kernel/arch/mips32/src/mm/as.c	(revision 69e9dd2f7155aa5c481a39cd38d3d9bc2e03423b)
@@ -35,4 +35,5 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <arch/mm/tlb.h>
@@ -40,5 +41,4 @@
 #include <mm/as.h>
 #include <arch/cp0.h>
-#include <arch.h>
 
 /** Architecture dependent address space init. */
@@ -58,5 +58,4 @@
 {
 	entry_hi_t hi;
-	ipl_t ipl;
 
 	/*
@@ -65,10 +64,6 @@
 	hi.value = cp0_entry_hi_read();
 
-	ipl = interrupts_disable();
-	spinlock_lock(&as->lock);
 	hi.asid = as->asid;
 	cp0_entry_hi_write(hi.value);	
-	spinlock_unlock(&as->lock);
-	interrupts_restore(ipl);
 }