Index: arch/sparc64/src/mm/as.c
===================================================================
--- arch/sparc64/src/mm/as.c	(revision 7e4e5323698b3059ed08f14198db2c9c1fbc746a)
+++ arch/sparc64/src/mm/as.c	(revision ecbdc7245534ef719f1c33d657c2cee6ab034ab6)
@@ -29,4 +29,5 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_ht.h>
+#include <genarch/mm/asid_fifo.h>
 
 /** Architecture dependent address space init. */
@@ -34,3 +35,4 @@
 {
 	as_operations = &as_ht_operations;
+	asid_fifo_init();
 }
Index: arch/sparc64/src/mm/tlb.c
===================================================================
--- arch/sparc64/src/mm/tlb.c	(revision 7e4e5323698b3059ed08f14198db2c9c1fbc746a)
+++ arch/sparc64/src/mm/tlb.c	(revision ecbdc7245534ef719f1c33d657c2cee6ab034ab6)
@@ -29,5 +29,4 @@
 #include <arch/mm/tlb.h>
 #include <mm/tlb.h>
-#include <genarch/mm/asid_fifo.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>
@@ -56,6 +55,4 @@
 	frame_address_t fr;
 	page_address_t pg;
-
-	asid_fifo_init();
 
 	fr.address = config.base;