diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-10-14 22:41:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-10-14 22:41:49 +0000 |
| commit | 40f4e95e0a4ab830c1f27d59d9c5e76233cd2b7d (patch) | |
| tree | 8fd4a7a7d366915427592fa72cdaac5ca2be5fa9 | |
| parent | e477b1145f89ab8e04a77a84850c1f4b5f39068f (diff) | |
delete strange historical FFS_SOFTUPDATES ifdef...
ok millert
| -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); |