about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-04-04 17:23:33 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-04-04 18:02:02 -0300
commit2e4cf778972573221e9b87fd992844ea9b67b9bf (patch)
tree9ca48c79dfdf8f56b2a9fd69889532c206343d86 /nptl
parentc3261cdb5b739c1e814de32e40ecd712ad987cdb (diff)
downloadglibc-2e4cf778972573221e9b87fd992844ea9b67b9bf.tar.gz
glibc-2e4cf778972573221e9b87fd992844ea9b67b9bf.tar.xz
glibc-2e4cf778972573221e9b87fd992844ea9b67b9bf.zip
Remove __ASSUME_REQUEUE_PI
The new cond var implementation (ed19993b5b0d) removed all the
__ASSUME_{REQUEUE_PI,FUTEX_LOCK_PI} internal usage so there is no
need to keep defining it.  This patch removes all USE_REQUEUE_PI
and __ASSUME_REQUEUE_PI.  It is as follow up from BZ#18463.

Checked with a build for x86_64-linux-gnu, arm-linux-gnueabhf,
m68-linux-gnu, mips64-linux-gnu, and sparc64-linux-gnu.

	* nptl/pthreadP.h (USE_REQUEUE_PI): Remove ununsed macro.
	* sysdeps/unix/sysv/linux/arm/kernel-features.h
	(__ASSUME_REQUEUE_PI): Likewise.
	* sysdeps/unix/sysv/linux/kernel-features.h
	(__ASSUME_REQUEUE_PI): Likewise.
	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
	(__ASSUME_REQUEUE_PI): Likewise.
	* sysdeps/unix/sysv/linux/mips/kernel-features.h
	(__ASSUME_REQUEUE_PI): Likewise.
	* sysdeps/unix/sysv/linux/sparc/kernel-features.h
	(__ASSUME_REQUEUE_PI): Likewise.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/pthreadP.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 4f76cbb62a..7fc1e50f78 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -603,18 +603,6 @@ extern void __wait_lookup_done (void) attribute_hidden;
 # define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " #name);
 #endif
 
-/* Test if the mutex is suitable for the FUTEX_WAIT_REQUEUE_PI operation.  */
-#if (defined lll_futex_wait_requeue_pi \
-     && defined __ASSUME_REQUEUE_PI)
-# define USE_REQUEUE_PI(mut) \
-   ((mut) && (mut) != (void *) ~0l \
-    && (((mut)->__data.__kind \
-	 & (PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NORMAL_NP)) \
-	== PTHREAD_MUTEX_PRIO_INHERIT_NP))
-#else
-# define USE_REQUEUE_PI(mut) 0
-#endif
-
 /* Returns 0 if POL is a valid scheduling policy.  */
 static inline int
 check_sched_policy_attr (int pol)