diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_settype.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e988e2b33c..823bb40108 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com> + * nptl/pthread_mutexattr_settype.c + (__pthread_mutexattr_settype): + Disable lock elision for PTHREAD_MUTEX_NORMAL. + +2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com> + * nptl/tst-mutex5 (do_test): Use #ifndef ENABLE_LOCK_ELISION instead of #ifdef. diff --git a/nptl/pthread_mutexattr_settype.c b/nptl/pthread_mutexattr_settype.c index 0e912920d0..cf648cf6ef 100644 --- a/nptl/pthread_mutexattr_settype.c +++ b/nptl/pthread_mutexattr_settype.c @@ -32,7 +32,7 @@ __pthread_mutexattr_settype (attr, kind) /* Cannot distinguish between DEFAULT and NORMAL. So any settype call disables elision for now. */ - if (kind == PTHREAD_MUTEX_DEFAULT) + if (kind == PTHREAD_MUTEX_NORMAL) kind |= PTHREAD_MUTEX_NO_ELISION_NP; iattr = (struct pthread_mutexattr *) attr; |