diff options
| author | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
| commit | f8b34e3f70219ed6642f2c3ed7430361969ccccf (patch) | |
| tree | 9fe86b328b35bc3515a752c557d6999aa602cfe7 /sys/netatm/ipatm | |
| parent | 162e49f535eeecc1626f095ecec2e27292d2dd24 (diff) | |
| download | FreeBSD-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/ipatm')
| -rw-r--r-- | sys/netatm/ipatm/ipatm_vcm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c index 35744cb..a14f1f1 100644 --- a/sys/netatm/ipatm/ipatm_vcm.c +++ b/sys/netatm/ipatm/ipatm_vcm.c @@ -578,8 +578,9 @@ ipatm_createsvc(ifp, daf, dst, sivp) /* * Allocate IP VCC + * May be called from timeout - don't wait. */ - ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK); + ivp = uma_zalloc(ipatm_vc_zone, M_NOWAIT); if (ivp == NULL) { err = ENOMEM; goto done; @@ -930,8 +931,9 @@ ipatm_incoming(tok, cop, ap, tokp) /* * Allocate IP VCC + * May be called from timeout - don't wait. */ - ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK); + ivp = uma_zalloc(ipatm_vc_zone, M_NOWAIT); if (ivp == NULL) { err = ENOMEM; cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE; |
