Disable lock elision for PTHREAD_MUTEX_NORMAL.

git-mirror · May 26, 2014 · 6736592 · 6736592
1 parent f8bdf1f
commit 6736592
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;