diff options
Diffstat (limited to 'sys/sys')
| -rw-r--r-- | sys/sys/lock.h | 5 | ||||
| -rw-r--r-- | sys/sys/lockmgr.h | 5 | ||||
| -rw-r--r-- | sys/sys/malloc.h | 8 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 5 |
4 files changed, 17 insertions, 6 deletions
diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 6d7544e..af98a7a 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $Id: lock.h,v 1.8 1997/08/18 02:06:30 dyson Exp $ + * $Id: lock.h,v 1.9 1997/08/30 07:59:47 fsmp Exp $ */ #ifndef _LOCK_H_ @@ -108,11 +108,12 @@ struct lock { * or passed in as arguments to the lock manager. The LK_REENABLE flag may be * set only at the release of a lock obtained by drain. */ -#define LK_EXTFLG_MASK 0x00000070 /* mask of external flags */ +#define LK_EXTFLG_MASK 0x01000070 /* mask of external flags */ #define LK_NOWAIT 0x00000010 /* do not sleep to await lock */ #define LK_SLEEPFAIL 0x00000020 /* sleep, then return failure */ #define LK_CANRECURSE 0x00000040 /* allow recursive exclusive lock */ #define LK_REENABLE 0x00000080 /* lock is be reenabled after drain */ +#define LK_NOPAUSE 0x01000000 /* no spinloop */ /* * Internal lock flags. * diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h index 6d7544e..af98a7a 100644 --- a/sys/sys/lockmgr.h +++ b/sys/sys/lockmgr.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $Id: lock.h,v 1.8 1997/08/18 02:06:30 dyson Exp $ + * $Id: lock.h,v 1.9 1997/08/30 07:59:47 fsmp Exp $ */ #ifndef _LOCK_H_ @@ -108,11 +108,12 @@ struct lock { * or passed in as arguments to the lock manager. The LK_REENABLE flag may be * set only at the release of a lock obtained by drain. */ -#define LK_EXTFLG_MASK 0x00000070 /* mask of external flags */ +#define LK_EXTFLG_MASK 0x01000070 /* mask of external flags */ #define LK_NOWAIT 0x00000010 /* do not sleep to await lock */ #define LK_SLEEPFAIL 0x00000020 /* sleep, then return failure */ #define LK_CANRECURSE 0x00000040 /* allow recursive exclusive lock */ #define LK_REENABLE 0x00000080 /* lock is be reenabled after drain */ +#define LK_NOPAUSE 0x01000000 /* no spinloop */ /* * Internal lock flags. * diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 7758629..2800861 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $Id: malloc.h,v 1.23 1997/08/16 19:16:10 wollman Exp $ + * $Id: malloc.h,v 1.24 1997/09/16 13:52:04 bde Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -272,6 +272,12 @@ struct kmembuckets { }; #ifdef KERNEL + +#include <vm/vm_zone.h> + + +#include <vm/vm_zone.h> + #define MINALLOCSIZE (1 << MINBUCKET) #define BUCKETINDX(size) \ ((size) <= (MINALLOCSIZE * 128) \ diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ac38919..acbccb5 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $Id: vnode.h,v 1.47 1997/08/31 07:32:35 phk Exp $ + * $Id: vnode.h,v 1.48 1997/09/14 02:25:41 peter Exp $ */ #ifndef _SYS_VNODE_H_ @@ -453,6 +453,9 @@ struct uio; struct vattr; struct vnode; struct vop_bwrite_args; +struct vm_zone; + +extern struct vm_zone *namei_zone; extern int (*lease_check_hook) __P((struct vop_lease_args *)); |
