From: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon, 26 May 2014 09:14:25 +0000 (+0200)
Subject: Disable lock elision for PTHREAD_MUTEX_NORMAL.
X-Git-Tag: upstream/2.30~7434
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=673659263d956f45f1ce0c66900fa7f1129db74a;p=external%2Fglibc.git

Disable lock elision for PTHREAD_MUTEX_NORMAL.
---

diff --git a/ChangeLog b/ChangeLog
index e988e2b..823bb40 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 0e91292..cf648cf 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;