summaryrefslogtreecommitdiffstats
path: root/sys/netatm/atm_device.c
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2003-07-23 14:28:57 +0000
committerharti <harti@FreeBSD.org>2003-07-23 14:28:57 +0000
commitf8b34e3f70219ed6642f2c3ed7430361969ccccf (patch)
tree9fe86b328b35bc3515a752c557d6999aa602cfe7 /sys/netatm/atm_device.c
parent162e49f535eeecc1626f095ecec2e27292d2dd24 (diff)
downloadFreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.zip
FreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.tar.gz
Convert a lot of uma_zalloc() calls to be NOWAIT instead of WAITOK. All
these may be called from contexts where we cannot sleep (callout handlers for example).
Diffstat (limited to 'sys/netatm/atm_device.c')
-rw-r--r--sys/netatm/atm_device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 34d4ffb..d3bc45b 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -163,8 +163,9 @@ atm_dev_inst(ssp, cvcp)
/*
* Allocate a VCC control block
+ * This can happen from a callout so don't wait here.
*/
- cvp = uma_zalloc(cup->cu_vcc_zone, M_WAITOK);
+ cvp = uma_zalloc(cup->cu_vcc_zone, M_NOWAIT);
if (cvp == NULL)
return (ENOMEM);
OpenPOWER on IntegriCloud