From 26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 13 Nov 2020 15:19:41 +0100 Subject: nptl: Eliminate 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 --- nptl/pthread_mutex_lock.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'nptl/pthread_mutex_lock.c') 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; -- cgit 1.4.1