From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Fri, 7 Oct 2005 18:23:40 +0000 (+0000)
Subject: STABLE14-linux-cv-init-20051007
X-Git-Tag: openafs-stable-1_4_1-rc1~63
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b5af16222a8d8950841a9250135c1867e0ae1e90;p=packages%2Fo%2Fopenafs.git

STABLE14-linux-cv-init-20051007

FIXES 20114

fix the CV_INIT macros


(cherry picked from commit 602f2ae816208f49e08667c65a3eee42ecc39041)
---

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index 8e08f004f..cf6828e46 100644
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -65,9 +65,9 @@ MUTEX_ISMINE(afs_kmutex_t * l)
 #define MUTEX_EXIT		afs_mutex_exit
 
 #if defined(AFS_LINUX24_ENV)
-#define CV_INIT(cv,b,c,d)      do { (cv)->seq = 0; init_waitqueue_head(&(cv)->waitq); } while (0)
+#define CV_INIT(cv,b,c,d)       do { (cv)->seq = 0; init_waitqueue_head(&(cv)->waitq); } while (0)
 #else
-#define CV_INIT(cv,b,c,d)	init_waitqueue((struct wait_queue**)(cv))
+#define CV_INIT(cv,b,c,d)	do { (cv)->seq = 0; init_waitqueue(&(cv)->waitq); } while (0)
 #endif
 #define CV_DESTROY(cv)
 #define CV_WAIT_SIG(cv, m)	afs_cv_wait(cv, m, 1)