diff options
| author |   deraadt <deraadt@openbsd.org> | 2020-10-14 22:41:48 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2020-10-14 22:41:48 +0000 |
| commit | 957017e219c880c0ecd2eb556910006db5fc5c99 (patch) | |
| tree | 822f2a0ee228634a1848e92239151de3e488bc70 /sys/kern/kern_malloc.c | |
| parent | use symbolic SYS_exit rather than 1, and skip using (diff) | |
| download | wireguard-openbsd-957017e219c880c0ecd2eb556910006db5fc5c99.tar.xz wireguard-openbsd-957017e219c880c0ecd2eb556910006db5fc5c99.zip | |
delete strange historical FFS_SOFTUPDATES ifdef...
ok millert
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 8efb291db63..ddd2fda77ab 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.141 2019/12/19 17:40:11 mpi Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.142 2020/10/14 22:41:48 deraadt Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -110,7 +110,7 @@ struct kmemusage *kmemusage; char *kmembase, *kmemlimit; char buckstring[16 * sizeof("123456,")]; int buckstring_init = 0; -#if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) char *memname[] = INITKMEMNAMES; char *memall = NULL; struct rwlock sysctl_kmemlock = RWLOCK_INITIALIZER("sysctlklk"); @@ -603,7 +603,7 @@ sysctl_malloc(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, #ifdef KMEMSTATS struct kmemstats km; #endif -#if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) int error; #endif int i, siz; @@ -648,7 +648,7 @@ sysctl_malloc(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return (EOPNOTSUPP); #endif case KERN_MALLOC_KMEMNAMES: -#if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) error = rw_enter(&sysctl_kmemlock, RW_WRITE|RW_INTR); if (error) return (error); |