From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 11 Mar 2004 06:30:58 +0000 (+0000)
Subject: rx-user-dont-redefine-isafs-glock-for-ukernel-20040311
X-Git-Tag: openafs-devel-1_3_60~47
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bfc88419b13fc1df44f033dcd3a73a92b2f46693;p=packages%2Fo%2Fopenafs.git

rx-user-dont-redefine-isafs-glock-for-ukernel-20040311


rx/UKERNEL/rx_kmutex.h already covers this
---

diff --git a/src/rx/rx_user.h b/src/rx/rx_user.h
index d63f7c847..a11a4cedd 100644
--- a/src/rx/rx_user.h
+++ b/src/rx/rx_user.h
@@ -23,11 +23,14 @@ error - foo error - foo error - foo
 #define USERPRI
 #define AFS_GLOCK()
 #define AFS_GUNLOCK()
-#define ISAFS_GLOCK()
 #define AFS_ASSERT_GLOCK()
 #define AFS_RXGLOCK()
 #define AFS_RXGUNLOCK()
-#define ISAFS_RXGLOCK()
+#ifndef UKERNEL
+/* Defined in rx/UKERNEL/rx_kmutex.h */
+#define ISAFS_GLOCK() 
+#define ISAFS_RXGLOCK() 
+#endif
 #define AFS_ASSERT_RXGLOCK()
 /* Some "operating-system independent" stuff, for the user mode implementation */
 #ifdef UAFS_CLIENT