From: Ben Pfaff <blp@nicira.com>
Date: Thu, 1 May 2014 15:46:45 +0000 (-0700)
Subject: ovs-thread: Fix OVS_ADAPTIVE_MUTEX_INITIALIZER.
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~16
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=e38785b39dc172d02bd2ae7db1a45a16e5517146

ovs-thread: Fix OVS_ADAPTIVE_MUTEX_INITIALIZER.

Commit 05bf6d3c62e1d (ovs-thread: Add checking for mutex and rwlock
initialization.) updated mutex and rwlock initializers to set the "where"
member to a nonnull value, but missed this one.  This commit fixes the
problem.

This does not cause real problems in practice because
OVS_ADAPTIVE_MUTEX_INITIALIZER has no existing users.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
---

diff --git a/lib/ovs-thread.h b/lib/ovs-thread.h
index 180b66f89..68db71fba 100644
--- a/lib/ovs-thread.h
+++ b/lib/ovs-thread.h
@@ -40,7 +40,7 @@ struct OVS_LOCKABLE ovs_mutex {
 
 #ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
 #define OVS_ADAPTIVE_MUTEX_INITIALIZER                  \
-    { PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP, NULL }
+    { PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP, "<unlocked>" }
 #else
 #define OVS_ADAPTIVE_MUTEX_INITIALIZER OVS_MUTEX_INITIALIZER
 #endif