Index: generic/src/synch/spinlock.c
===================================================================
--- generic/src/synch/spinlock.c	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ generic/src/synch/spinlock.c	(revision adb2ebf8ae233e612225d6bd9fe2229d2b8e4d67)
@@ -64,5 +64,5 @@
 {
 	count_t i = 0;
-	__address caller = ((__address *) &sl)[-1];
+	__address caller = CALLER(sl);
 	char *symbol;
 	bool deadlock_reported = false;