diff options
| author | jhb <jhb@FreeBSD.org> | 2006-01-06 18:03:45 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2006-01-06 18:03:45 +0000 |
| commit | b183f7d5ee2596f436239b4b518900baf2efa962 (patch) | |
| tree | e2f68d49da7b35ad0face9264b3d2cc0287aa074 /sys/vm | |
| parent | c29a43240c8e60c8620feab9604ed1036fe72652 (diff) | |
| download | FreeBSD-src-b183f7d5ee2596f436239b4b518900baf2efa962.zip FreeBSD-src-b183f7d5ee2596f436239b4b518900baf2efa962.tar.gz | |
Reduce the scope of one #ifdef to avoid duplicating a SYSCTL_INT() macro
and trim another unneeded #ifdef (it was just around a macro that is
already conditionally defined).
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/uma_core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 6b0426ef..1cec429 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -250,13 +250,11 @@ static int sysctl_vm_zone_stats(SYSCTL_HANDLER_ARGS); #ifdef WITNESS static int nosleepwithlocks = 1; -SYSCTL_INT(_debug, OID_AUTO, nosleepwithlocks, CTLFLAG_RW, &nosleepwithlocks, - 0, "Convert M_WAITOK to M_NOWAIT to avoid lock-held-across-sleep paths"); #else static int nosleepwithlocks = 0; +#endif SYSCTL_INT(_debug, OID_AUTO, nosleepwithlocks, CTLFLAG_RW, &nosleepwithlocks, 0, "Convert M_WAITOK to M_NOWAIT to avoid lock-held-across-sleep paths"); -#endif SYSCTL_OID(_vm, OID_AUTO, zone, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, sysctl_vm_zone, "A", "Zone Info"); SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL); @@ -1800,10 +1798,8 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags) #endif } else { badness = 0; -#ifdef WITNESS WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "malloc(M_WAITOK) of \"%s\"", zone->uz_name); -#endif } if (badness) { flags &= ~M_WAITOK; |
