diff options
| author | ad <ad@NetBSD.org> | 2008-01-25 01:09:18 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-01-25 01:09:18 +0000 |
| commit | bba572530bb8d4bdf02a8855a4dab3d806f85993 (patch) | |
| tree | d7201521010faf9394376b515bc66d6041be95ef /lib/libpthread | |
| parent | a06bac7d44eed680c5164d60edaf0430df018e8a (diff) | |
pthread_mutex_lock_slow: remove "deliberate deadlock" code that's not
needed with 1:1. PR lib/37524.
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/pthread_mutex.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/libpthread/pthread_mutex.c b/lib/libpthread/pthread_mutex.c index 3ff3418d52e..840e1d2bc60 100644 --- a/lib/libpthread/pthread_mutex.c +++ b/lib/libpthread/pthread_mutex.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_mutex.c,v 1.41 2008/01/08 20:56:08 christos Exp $ */ +/* $NetBSD: pthread_mutex.c,v 1.42 2008/01/25 01:09:18 ad Exp $ */ /*- * Copyright (c) 2001, 2003, 2006, 2007 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_mutex.c,v 1.41 2008/01/08 20:56:08 christos Exp $"); +__RCSID("$NetBSD: pthread_mutex.c,v 1.42 2008/01/25 01:09:18 ad Exp $"); #include <sys/types.h> @@ -245,16 +245,6 @@ pthread_mutex_lock_slow(pthread_t self, pthread_mutex_t *mutex) } } - if (pthread__started == 0) { - /* The spec says we must deadlock, so... */ - pthread__assert(mp->type == PTHREAD_MUTEX_NORMAL); - (void) sigprocmask(SIG_SETMASK, NULL, &ss); - for (;;) { - sigsuspend(&ss); - } - /*NOTREACHED*/ - } - /* * Locking a mutex is not a cancellation * point, so we don't need to do the |
