Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision 312cc6835611cf9973757338ffdd91cb89e0ab0a)
@@ -46,8 +46,5 @@
 #include <align.h>
 #include <interrupt.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 static void tlb_refill_fail(istate_t *);
@@ -324,19 +321,12 @@
 void tlb_refill_fail(istate_t *istate)
 {
-	char *symbol = "";
-	char *sym2 = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-	s = get_symtab_entry(istate->ra);
-	if (s)
-		sym2 = s;
-#endif
-
+	char *symbol, *sym2;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
+	sym2 = symtab_fmt_name_lookup(istate->ra);
+	
 	fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Refill Exception at %x(%s<-%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Refill Exception at %x (%s<-%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol, sym2);
 }
@@ -345,15 +335,11 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-	char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-#endif
+	char *symbol;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
 
 	fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Invalid Exception at %x(%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Invalid Exception at %x (%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol);
 }
@@ -361,15 +347,11 @@
 void tlb_modified_fail(istate_t *istate)
 {
-	char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-#endif
+	char *symbol;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
 
 	fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Modified Exception at %x(%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Modified Exception at %x (%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol);
 }