about summary refs log tree commit diff
path: root/nptl/pthread_mutex_lock.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-11-13 15:19:41 +0100
committerFlorian Weimer <fweimer@redhat.com>2020-11-13 15:20:10 +0100
commit26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3 (patch)
tree709823d1994876ad92abcffe368bb74899dfd1e5 /nptl/pthread_mutex_lock.c
parentd5c4cce9c3eb82cb57d01a3ce3a0999e146abd63 (diff)
downloadglibc-26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3.tar.gz
glibc-26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3.tar.xz
glibc-26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3.zip
nptl: Eliminate <smp.h> and __is_smp
Most systems are SMP, so optimizing for the UP case is no longer
approriate.  A dynamic check based on the kernel identification
has been only implemented for i386 anyway.

To disable adaptive mutexes on sh, define DEFAULT_ADAPTIVE_COUNT
as zero for this architecture.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_mutex_lock.c')
-rw-r--r--nptl/pthread_mutex_lock.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
index 7858abd528..fac774e608 100644
--- a/nptl/pthread_mutex_lock.c
+++ b/nptl/pthread_mutex_lock.c
@@ -120,9 +120,6 @@ __pthread_mutex_lock (pthread_mutex_t *mutex)
   else if (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex)
 			  == PTHREAD_MUTEX_ADAPTIVE_NP, 1))
     {
-      if (! __is_smp)
-	goto simple;
-
       if (LLL_MUTEX_TRYLOCK (mutex) != 0)
 	{
 	  int cnt = 0;