From 795229a9f573c6e51eb9ae7f4b25294f2105704b Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Tue, 8 Sep 2009 20:04:03 +0000
Subject: [PATCH] Use PTHREAD_MUTEX_ERRORCHECK.  This enables rump deadlock
 detection once again: panic: rumpuser fatal failure 11 (Resource deadlock
 avoided)

---
 sys/rump/librump/rumpuser/rumpuser_pth.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys/rump/librump/rumpuser/rumpuser_pth.c b/sys/rump/librump/rumpuser/rumpuser_pth.c
index 711ff097eca0..41753692e520 100644
--- a/sys/rump/librump/rumpuser/rumpuser_pth.c
+++ b/sys/rump/librump/rumpuser/rumpuser_pth.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_pth.c,v 1.34 2009/07/14 21:00:53 apb Exp $	*/
+/*	$NetBSD: rumpuser_pth.c,v 1.35 2009/09/08 20:04:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_pth.c,v 1.34 2009/07/14 21:00:53 apb Exp $");
+__RCSID("$NetBSD: rumpuser_pth.c,v 1.35 2009/09/08 20:04:03 pooka Exp $");
 #endif /* !lint */
 
 #ifdef __linux__
@@ -237,8 +237,15 @@ rumpuser_thread_exit(void)
 void
 rumpuser_mutex_init(struct rumpuser_mtx **mtx)
 {
+	pthread_mutexattr_t att;
+
 	NOFAIL(*mtx = malloc(sizeof(struct rumpuser_mtx)));
-	NOFAIL_ERRNO(pthread_mutex_init(&((*mtx)->pthmtx), NULL));
+
+	pthread_mutexattr_init(&att);
+	pthread_mutexattr_settype(&att, PTHREAD_MUTEX_ERRORCHECK);
+	NOFAIL_ERRNO(pthread_mutex_init(&((*mtx)->pthmtx), &att));
+	pthread_mutexattr_destroy(&att);
+
 	(*mtx)->owner = NULL;
 	(*mtx)->recursion = 0;
 }