From 3b66ac9138bbf0fa12b71d837e0efedb6f01f555 Mon Sep 17 00:00:00 2001 From: green Date: Mon, 19 Jul 2004 15:05:24 +0000 Subject: Since breakage of malloc(9)/uma_zalloc(9) is totally non-optional in GENERIC/for WITNESS users, make sure the sysctl to disable the behavior is read-only and always enabled. --- sys/vm/uma_core.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sys/vm/uma_core.c') diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 4b25a1b..6f6157f 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -224,9 +224,15 @@ void uma_print_zone(uma_zone_t); void uma_print_stats(void); static int sysctl_vm_zone(SYSCTL_HANDLER_ARGS); +#ifdef WITNESS +static int nosleepwithlocks = 1; +SYSCTL_INT(_debug, OID_AUTO, nosleepwithlocks, CTLFLAG_RD, &nosleepwithlocks, + 0, "Convert M_WAITOK to M_NOWAIT to avoid lock-held-across-sleep paths"); +#else static int nosleepwithlocks = 0; 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); -- cgit v1.1