diff options
| -rw-r--r-- | sys/kern/kern_malloc.c | 6 | ||||
| -rw-r--r-- | sys/sys/malloc.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index b2b58ea22e5..4674fcb3585 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.47 2002/02/12 17:19:41 provos Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.48 2002/06/11 05:58:17 art Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -157,7 +157,7 @@ malloc(size, type, flags) indx = BUCKETINDX(size); kbp = &bucket[indx]; - s = splimp(); + s = splvm(); #ifdef KMEMSTATS while (ksp->ks_memuse >= ksp->ks_limit) { if (flags & M_NOWAIT) { @@ -350,7 +350,7 @@ free(addr, type) kup = btokup(addr); size = 1 << kup->ku_indx; kbp = &bucket[kup->ku_indx]; - s = splimp(); + s = splvm(); #ifdef DIAGNOSTIC /* * Check for returns of data that do not point to the diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 59440311c49..01ac98f121c 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.h,v 1.56 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: malloc.h,v 1.57 2002/06/11 05:56:52 art Exp $ */ /* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */ /* @@ -372,7 +372,7 @@ struct kmembuckets { #else /* do not collect statistics */ #define MALLOC(space, cast, size, type, flags) do { \ register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \ - long s = splimp(); \ + long s = splvm(); \ if (kbp->kb_next == NULL) { \ (space) = (cast)malloc((u_long)(size), type, flags); \ } else { \ @@ -385,7 +385,7 @@ struct kmembuckets { #define FREE(addr, type) do { \ register struct kmembuckets *kbp; \ register struct kmemusage *kup = btokup(addr); \ - long s = splimp(); \ + long s = splvm(); \ if (1 << kup->ku_indx > MAXALLOCSAVE) { \ free((caddr_t)(addr), type); \ } else { \ |