diff options
| -rw-r--r-- | sys/alpha/linux/linux_sysvec.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 3 | ||||
| -rw-r--r-- | sys/i386/ibcs2/imgact_coff.c | 3 | ||||
| -rw-r--r-- | sys/i386/linux/imgact_linux.c | 3 | ||||
| -rw-r--r-- | sys/i386/linux/linux_misc.c | 3 | ||||
| -rw-r--r-- | sys/i386/linux/linux_sysvec.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 3 | ||||
| -rw-r--r-- | sys/vm/lock.h | 117 |
8 files changed, 9 insertions, 131 deletions
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c index f862038..7ae089e 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_sysvec.c,v 1.11 1997/02/22 09:38:26 peter Exp $ + * $Id: linux_sysvec.c,v 1.12 1997/03/29 10:50:27 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -44,7 +44,7 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_prot.h> -#include <vm/lock.h> +#include <sys/lock.h> #include <vm/vm_kern.h> #include <vm/vm_object.h> #include <vm/vm_page.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 7d5bd59..9f88a75 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.25 1997/03/23 03:36:04 bde Exp $ + * $Id: linux_misc.c,v 1.26 1997/03/24 11:24:30 bde Exp $ */ #include <sys/param.h> @@ -54,7 +54,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_prot.h> #include <vm/vm_map.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index e4ee8cc..7cbe5d4 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_coff.c,v 1.21 1997/02/22 09:33:30 peter Exp $ + * $Id: imgact_coff.c,v 1.22 1997/03/23 03:34:09 bde Exp $ */ #include <sys/param.h> @@ -46,7 +46,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_prot.h> -#include <vm/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_kern.h> diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 2d01d1d..2351c84 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: imgact_linux.c,v 1.20 1997/02/22 09:38:18 peter Exp $ */ #ifndef LKM @@ -51,7 +51,6 @@ #include <vm/vm_kern.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <vm/lock.h> #include <vm/vm_map.h> #include <vm/vm_prot.h> #include <vm/vm_extern.h> diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index 7d5bd59..9f88a75 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.25 1997/03/23 03:36:04 bde Exp $ + * $Id: linux_misc.c,v 1.26 1997/03/24 11:24:30 bde Exp $ */ #include <sys/param.h> @@ -54,7 +54,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_prot.h> #include <vm/vm_map.h> diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index f862038..7ae089e 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_sysvec.c,v 1.11 1997/02/22 09:38:26 peter Exp $ + * $Id: linux_sysvec.c,v 1.12 1997/03/29 10:50:27 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -44,7 +44,7 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_prot.h> -#include <vm/lock.h> +#include <sys/lock.h> #include <vm/vm_kern.h> #include <vm/vm_object.h> #include <vm/vm_page.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 494a53d..6eb2404 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id$ + * $Id: vfs_bio.c,v 1.112 1997/02/22 09:39:30 peter Exp $ */ /* @@ -51,7 +51,6 @@ #include <vm/vm_page.h> #include <vm/vm_object.h> #include <vm/vm_extern.h> -#include <vm/lock.h> #include <vm/vm_map.h> #include <sys/buf.h> #include <sys/mount.h> diff --git a/sys/vm/lock.h b/sys/vm/lock.h deleted file mode 100644 index aabe9c7..0000000 --- a/sys/vm/lock.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * The Mach Operating System project at Carnegie-Mellon University. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)lock.h 8.1 (Berkeley) 6/11/93 - * - * - * Copyright (c) 1987, 1990 Carnegie-Mellon University. - * All rights reserved. - * - * Authors: Avadis Tevanian, Jr., Michael Wayne Young - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - * - * $Id$ - */ - -/* - * Locking primitives definitions - */ - -#ifndef _LOCK_H_ -#define _LOCK_H_ - -/* - * The general lock structure. Provides for multiple readers, - * upgrading from read to write, and sleeping until the lock - * can be gained. - */ -struct lock { - /* - * Only the "interlock" field is used for hardware exclusion; other - * fields are modified with normal instructions after acquiring the - * interlock bit. - */ - boolean_t want_write; /* Writer is waiting, or locked for write */ - boolean_t want_upgrade; /* Read-to-write upgrade waiting */ - boolean_t waiting; /* Someone is sleeping on lock */ - boolean_t can_sleep; /* Can attempts to lock go to sleep */ - int read_count; /* Number of accepted readers */ - struct proc *proc; /* If recursive locking, process that has lock */ - int recursion_depth; /* Depth of recursion */ -}; - -typedef struct lock lock_data_t; -typedef struct lock *lock_t; - -/* Sleep locks must work even if no multiprocessing. */ - -#define lock_read_done(l) lock_done(l) -#define lock_write_done(l) lock_done(l) - -#ifdef KERNEL -void lock_clear_recursive __P((lock_t)); -void lock_done __P((lock_t)); -void lock_init __P((lock_t, boolean_t)); -void lock_read __P((lock_t)); -boolean_t lock_read_to_write __P((lock_t)); -void lock_set_recursive __P((lock_t)); -void lock_sleepable __P((lock_t, boolean_t)); -boolean_t lock_try_read __P((lock_t)); -boolean_t lock_try_read_to_write __P((lock_t)); -boolean_t lock_try_write __P((lock_t)); -void lock_write __P((lock_t)); -void lock_write_to_read __P((lock_t)); -#endif - -#endif /* !_LOCK_H_ */ |
