diff options
| author | bde <bde@FreeBSD.org> | 1999-01-02 11:34:57 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-01-02 11:34:57 +0000 |
| commit | 734d13314e6e9f235abcba66a420f81b29606173 (patch) | |
| tree | a59d3d6af3585db9166b59563c58b540faccaa4d /sys/kern | |
| parent | 60b0c6afef485cb129b9755b9ca0fc373c700689 (diff) | |
| download | FreeBSD-src-734d13314e6e9f235abcba66a420f81b29606173.zip FreeBSD-src-734d13314e6e9f235abcba66a420f81b29606173.tar.gz | |
Ifdefed conditionally used simplock variables.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_rman.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_export.c | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index ddf576c..e0526bb 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_rman.c,v 1.2 1998/11/23 09:33:35 bde Exp $ + * $Id: subr_rman.c,v 1.3 1998/12/07 21:58:29 archie Exp $ */ /* @@ -68,7 +68,9 @@ MALLOC_DEFINE(M_RMAN, "rman", "Resource manager"); struct rman_head rman_head; +#ifndef NULL_SIMPLELOCKS static struct simplelock rman_lock; /* mutex to protect rman_head */ +#endif static int int_rman_activate_resource(struct rman *rm, struct resource *r, struct resource **whohas); static int int_rman_release_resource(struct rman *rm, struct resource *r); diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 2be30f2..f8bc7f7 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.176 1998/12/22 00:44:11 eivind Exp $ + * $Id: vfs_subr.c,v 1.177 1998/12/24 12:07:16 bde Exp $ */ /* @@ -107,11 +107,13 @@ SYSCTL_INT(_vfs, OID_AUTO, ioopt, CTLFLAG_RW, &vfs_ioopt, 0, ""); struct mntlist mountlist; /* mounted filesystem list */ struct simplelock mountlist_slock; -static struct simplelock mntid_slock; struct simplelock mntvnode_slock; int nfs_mount_type = -1; +#ifndef NULL_SIMPLELOCKS +static struct simplelock mntid_slock; static struct simplelock vnode_free_list_slock; static struct simplelock spechash_slock; +#endif struct nfs_public nfs_pub; /* publicly exported FS */ static vm_zone_t vnode_zone; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 2be30f2..f8bc7f7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.176 1998/12/22 00:44:11 eivind Exp $ + * $Id: vfs_subr.c,v 1.177 1998/12/24 12:07:16 bde Exp $ */ /* @@ -107,11 +107,13 @@ SYSCTL_INT(_vfs, OID_AUTO, ioopt, CTLFLAG_RW, &vfs_ioopt, 0, ""); struct mntlist mountlist; /* mounted filesystem list */ struct simplelock mountlist_slock; -static struct simplelock mntid_slock; struct simplelock mntvnode_slock; int nfs_mount_type = -1; +#ifndef NULL_SIMPLELOCKS +static struct simplelock mntid_slock; static struct simplelock vnode_free_list_slock; static struct simplelock spechash_slock; +#endif struct nfs_public nfs_pub; /* publicly exported FS */ static vm_zone_t vnode_zone; |
