Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
+++ kernel/generic/src/synch/spinlock.c	(revision 9df34ee0a5c9ec052cc771b224828b22e30f0747)
@@ -43,8 +43,5 @@
 #include <print.h>
 #include <debug.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 #ifdef CONFIG_FB
@@ -81,7 +78,4 @@
 	count_t i = 0;
 	bool deadlock_reported = false;
-#ifdef CONFIG_SYMTAB
-	char *symbol;
-#endif
 
 	preemption_disable();
@@ -112,12 +106,8 @@
 #endif
 		if (i++ > DEADLOCK_THRESHOLD) {
-			printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp,
-				CPU->id, sl, sl->name, CALLER);
-#ifdef CONFIG_SYMTAB
-			symbol = get_symtab_entry(CALLER);
-			if (symbol)
-				printf("(%s)", symbol);
-#endif
-			printf("\n");
+			printf("cpu%u: looping on spinlock %" PRIp ":%s, "
+			    "caller=%" PRIp "(%s)", CPU->id, sl, sl->name,
+			    CALLER, symtab_fmt_name_lookup(CALLER));
+
 			i = 0;
 			deadlock_reported = true;