From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 7 Dec 2007 21:11:44 +0000 (+0000)
Subject: Merged revisions 91826 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6705bd808de2f1b332465f1af561259e17abd50;p=thirdparty%2Fasterisk.git

Merged revisions 91826 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91826 | russell | 2007-12-07 15:11:08 -0600 (Fri, 07 Dec 2007) | 6 lines

I love fixing lock related errors in the lock debugging code.  That's about as
ironic as it gets in Asterisk programming land.  Anyway, I spotted this bug while
trying to track down why systems are locking up and acting weird in issue #11080.
The mutex attribute object was marked as static in this function when it should
not have been.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91827 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index c9f4b4eae5..d4870b9664 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -187,7 +187,7 @@ static inline void ast_reentrancy_unlock(ast_mutex_t *p_ast_mutex)
 static inline void ast_reentrancy_init(ast_mutex_t *p_ast_mutex)
 {
 	int i;
-	static pthread_mutexattr_t reentr_attr;
+	pthread_mutexattr_t reentr_attr;
 
 	for (i = 0; i < AST_MAX_REENTRANCY; i++) {
 		p_ast_mutex->file[i] = NULL;