Disable lock elision for PTHREAD_MUTEX_NORMAL.

diff --git a/ChangeLog b/ChangeLog
index e988e2b33c89c1e8eaa14305606df4ccaac8a016..823bb40108aec9e62c781a32a7d4f021c0ddd245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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):

diff --git a/nptl/pthread_mutexattr_settype.c b/nptl/pthread_mutexattr_settype.c
index 0e912920d0c9c246956e01223954afa03212f021..cf648cf6ef273a79b82a6a85fac0c08331b8ad32 100644 (file)
--- 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;