diff options
| author | Xinyu Chen <Xinyu.Chen@freescale.com> | 2009-08-06 17:34:24 +0800 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2009-08-07 09:47:49 -0500 |
| commit | 82e8f4a0d1de72feb4d12b79fbdca7695da6302e (patch) | |
| tree | a77d05d6f817e7f3a72c7d962c734ff57ccc6a0c /drivers | |
| parent | da31b0fbd29555800ab5ccab7ac9b5e3dbd28795 (diff) | |
ENGR00114922 MX233 Bring DMA ZONE to kernel
Split memory zone to DMA and normal zone for dma allocation.
Make the DMA zone size configurable.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 31944b11e6ea..2d543552ae0d 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c @@ -255,7 +255,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, mem->size = PAGE_ALIGN(q->bufs[first]->bsize); mem->vaddr = dma_alloc_coherent(q->dev, mem->size, - &mem->dma_handle, GFP_KERNEL); + &mem->dma_handle, GFP_KERNEL | GFP_DMA); if (!mem->vaddr) { dev_err(q->dev, "dma_alloc_coherent size %ld failed\n", mem->size); |