Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision 557394294b6545575e0e9b328455da8ae4cf8a51)
+++ kernel/generic/include/synch/mutex.h	(revision 69e9dd2f7155aa5c481a39cd38d3d9bc2e03423b)
@@ -45,11 +45,9 @@
 
 #define mutex_lock(mtx) \
-	_mutex_lock_timeout((mtx),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NONE)
+	_mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
 #define mutex_trylock(mtx) \
-	_mutex_lock_timeout((mtx),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NON_BLOCKING)
-#define mutex_lock_timeout(mtx,usec) \
-	_mutex_lock_timeout((mtx),(usec),SYNCH_FLAGS_NON_BLOCKING)
-#define mutex_lock_active(mtx) \
-	while (mutex_trylock((mtx)) != ESYNCH_OK_ATOMIC)
+	_mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING)
+#define mutex_lock_timeout(mtx, usec) \
+	_mutex_lock_timeout((mtx), (usec), SYNCH_FLAGS_NON_BLOCKING)
 
 extern void mutex_initialize(mutex_t *mtx);
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 557394294b6545575e0e9b328455da8ae4cf8a51)
+++ kernel/generic/include/synch/spinlock.h	(revision 69e9dd2f7155aa5c481a39cd38d3d9bc2e03423b)
@@ -102,4 +102,22 @@
 }
 
+#ifdef CONFIG_DEBUG_SPINLOCK
+
+extern int printf(const char *, ...);
+
+#define DEADLOCK_THRESHOLD		100000000
+#define DEADLOCK_PROBE_INIT(pname)	count_t pname = 0
+#define DEADLOCK_PROBE(pname, value)					\
+	if ((pname)++ > (value)) {					\
+		(pname) = 0;						\
+		printf("Deadlock probe %s: exceeded threshold %d\n",	\
+		    "cpu%d: function=%s, line=%d\n",			\
+		    #pname, (value), CPU->id, __FUNCTION__, __LINE__);	\
+	}
+#else
+#define DEADLOCK_PROBE_INIT(pname)
+#define DEADLOCK_PROBE(pname, value)
+#endif
+
 #else
 
@@ -114,4 +132,7 @@
 #define spinlock_unlock(x)		preemption_enable()
 
+#define DEADLOCK_PROBE_INIT(pname)
+#define DEADLOCK_PROBE(pname, value)
+
 #endif