From 673659263d956f45f1ce0c66900fa7f1129db74a Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Mon, 26 May 2014 11:14:25 +0200 Subject: [PATCH] Disable lock elision for PTHREAD_MUTEX_NORMAL. --- ChangeLog | 6 ++++++ nptl/pthread_mutexattr_settype.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e988e2b33c..823bb40108 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-26 Stefan Liebler + + * nptl/pthread_mutexattr_settype.c + (__pthread_mutexattr_settype): + Disable lock elision for PTHREAD_MUTEX_NORMAL. + 2014-05-26 Stefan Liebler * nptl/tst-mutex5 (do_test): 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;