diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_proc.c | 8 | ||||
| -rw-r--r-- | sys/kern/kern_subr.c | 12 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_cache.c | 4 |
4 files changed, 10 insertions, 18 deletions
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c9f4630665e..d431cc3315b 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_proc.c,v 1.5 1998/03/02 07:19:11 todd Exp $ */ +/* $OpenBSD: kern_proc.c,v 1.6 1999/04/28 09:28:14 art Exp $ */ /* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */ /* @@ -89,9 +89,9 @@ procinit() LIST_INIT(&allproc); LIST_INIT(&zombproc); - pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash); - pgrphashtbl = hashinit(maxproc / 4, M_PROC, &pgrphash); - uihashtbl = hashinit(maxproc / 16, M_PROC, &uihash); + pidhashtbl = hashinit(maxproc / 4, M_PROC, M_WAITOK, &pidhash); + pgrphashtbl = hashinit(maxproc / 4, M_PROC, M_WAITOK, &pgrphash); + uihashtbl = hashinit(maxproc / 16, M_PROC, M_WAITOK, &uihash); } /* diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 6e9edbb950a..be226f857e8 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_subr.c,v 1.8 1999/02/26 04:56:02 art Exp $ */ +/* $OpenBSD: kern_subr.c,v 1.9 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */ /* @@ -161,15 +161,7 @@ again: * General routine to allocate a hash table. */ void * -hashinit(elements, type, hashmask) - int elements, type; - u_long *hashmask; -{ - return newhashinit(elements, type, M_WAITOK, hashmask); -} - -void * -newhashinit(elements, type, flags, hashmask) +hashinit(elements, type, flags, hashmask) int elements, type, flags; u_long *hashmask; { diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index e3dc675b9d9..4f9cf928510 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.21 1998/11/29 01:46:58 art Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.22 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /*- @@ -144,7 +144,7 @@ bufinit() for (dp = bufqueues; dp < &bufqueues[BQUEUES]; dp++) TAILQ_INIT(dp); - bufhashtbl = hashinit(nbuf, M_CACHE, &bufhash); + bufhashtbl = hashinit(nbuf, M_CACHE, M_WAITOK, &bufhash); base = bufpages / nbuf; residual = bufpages % nbuf; for (i = 0; i < nbuf; i++) { diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 6a626ca7aa3..34a983afb61 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cache.c,v 1.2 1996/03/03 17:20:23 niklas Exp $ */ +/* $OpenBSD: vfs_cache.c,v 1.3 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $ */ /* @@ -227,7 +227,7 @@ nchinit() { TAILQ_INIT(&nclruhead); - nchashtbl = hashinit(desiredvnodes, M_CACHE, &nchash); + nchashtbl = hashinit(desiredvnodes, M_CACHE, M_WAITOK, &nchash); } /* |