aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/tst-mutex5.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 027464d..e988e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * nptl/tst-mutex5 (do_test):
+ Use #ifndef ENABLE_LOCK_ELISION instead of #ifdef.
+
2014-05-26 Siddhesh Poyarekar <siddhesh@redhat.com>
* benchtests/README: Document 'init' directive.
diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c
index 14d3025..a829272 100644
--- a/nptl/tst-mutex5.c
+++ b/nptl/tst-mutex5.c
@@ -87,7 +87,7 @@ do_test (void)
}
/* Elided locks do not time out. */
-#ifdef ENABLE_LOCK_ELISION
+#ifndef ENABLE_LOCK_ELISION
if (pthread_mutex_trylock (&m) == 0)
{
puts ("mutex_trylock succeeded");