33c33
< __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 244473 2012-12-20 00:50:04Z cognet $");
---
> __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 244575 2012-12-22 01:04:29Z cognet $");
570c570
< map = uma_zalloc_arg(dmamap_zone, dmat, M_WAITOK);
---
> map = uma_zalloc_arg(dmamap_zone, dmat, M_NOWAIT);
571a572,573
> if (map == NULL)
> return (ENOMEM);
577c579
< if (dmat->segments == NULL)
---
> if (dmat->segments == NULL) {
579c581,587
< sizeof(*dmat->segments), M_DEVBUF, M_WAITOK);
---
> sizeof(*dmat->segments), M_DEVBUF, M_NOWAIT);
> if (dmat->segments == NULL) {
> uma_zfree(dmamap_zone, map);
> *mapp = NULL;
> return (ENOMEM);
> }
> }