diff options
| author | Andreas Schwab <schwab@suse.de> | 2014-03-04 13:00:26 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2014-12-11 12:44:27 +0100 |
| commit | b0a3c1640ab2fb7d16d9b9a8d9c0e524e9cb0001 (patch) | |
| tree | 3e3d5fbf0d33c32e0219d27089b0491b3be42466 /sysdeps/unix/sysv/linux | |
| parent | da5bcaa49916fd99c1cd2bfe11923e680056abd7 (diff) | |
| download | glibc-b0a3c1640ab2fb7d16d9b9a8d9c0e524e9cb0001.tar.gz glibc-b0a3c1640ab2fb7d16d9b9a8d9c0e524e9cb0001.tar.xz glibc-b0a3c1640ab2fb7d16d9b9a8d9c0e524e9cb0001.zip | |
Properly handle forced elision in pthread_mutex_trylock (bug 16657)
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/force-elision.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/force-elision.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/force-elision.h b/sysdeps/unix/sysv/linux/s390/force-elision.h index 8fd7684d9a..31b3662ba1 100644 --- a/sysdeps/unix/sysv/linux/s390/force-elision.h +++ b/sysdeps/unix/sysv/linux/s390/force-elision.h @@ -17,11 +17,6 @@ <http://www.gnu.org/licenses/>. */ #ifdef ENABLE_LOCK_ELISION -/* Check for elision on this lock without upgrading. */ -#define DO_ELISION(m) \ - (__pthread_force_elision \ - && (m->__data.__kind & PTHREAD_MUTEX_NO_ELISION_NP) == 0) \ - /* Automatically enable elision for existing user lock kinds. */ #define FORCE_ELISION(m, s) \ if (__pthread_force_elision \ diff --git a/sysdeps/unix/sysv/linux/x86/force-elision.h b/sysdeps/unix/sysv/linux/x86/force-elision.h index 945f8867fc..a767cf1976 100644 --- a/sysdeps/unix/sysv/linux/x86/force-elision.h +++ b/sysdeps/unix/sysv/linux/x86/force-elision.h @@ -16,11 +16,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Check for elision on this lock without upgrading. */ -#define DO_ELISION(m) \ - (__pthread_force_elision \ - && (m->__data.__kind & PTHREAD_MUTEX_NO_ELISION_NP) == 0) \ - /* Automatically enable elision for existing user lock kinds. */ #define FORCE_ELISION(m, s) \ if (__pthread_force_elision \ |