diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2012-10-19 19:28:35 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2012-10-19 19:28:35 +0000 |
| commit | d2b91851767a7d73faa889bb0752f98bd24c6c08 (patch) | |
| tree | bbf2ca6d0ee7e58c3da9e2cca4db88ebdea1f27f /sys/dev/netmap/netmap_mem2.c | |
| parent | a18367634e37ccc05ae0cd5268816921019dd18c (diff) | |
Notes
Diffstat (limited to 'sys/dev/netmap/netmap_mem2.c')
| -rw-r--r-- | sys/dev/netmap/netmap_mem2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 303b2adaf54a6..7472178a25b88 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -595,7 +595,7 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p) #ifdef linux p->lut = vmalloc(n); #else - p->lut = malloc(n, M_NETMAP, M_WAITOK | M_ZERO); + p->lut = malloc(n, M_NETMAP, M_NOWAIT | M_ZERO); #endif if (p->lut == NULL) { D("Unable to create lookup table (%d bytes) for '%s'", n, p->name); @@ -604,7 +604,7 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p) /* Allocate the bitmap */ n = (p->objtotal + 31) / 32; - p->bitmap = malloc(sizeof(uint32_t) * n, M_NETMAP, M_WAITOK | M_ZERO); + p->bitmap = malloc(sizeof(uint32_t) * n, M_NETMAP, M_NOWAIT | M_ZERO); if (p->bitmap == NULL) { D("Unable to create bitmap (%d entries) for allocator '%s'", n, p->name); |