aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@novell.com>2007-01-12 19:26:32 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-15 13:26:01 -0500
commit10329b962be782fa4fbebea9358063a4507d0c4d (patch)
treecfaefaecc6cc64bf978d5136e129abc9a6bd395a /drivers/media
parente382f62be8a92ebbdf697ebfab260b7d943a359f (diff)
V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory
We have a DMA32 zone now, lets use it to make sure the card can reach the memory we have allocated for the video frame buffers. Signed-off-by: Gerds Hoffmann <kraxel@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/video-buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index f429f49901b9..635d102c86f0 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -1229,7 +1229,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
1229 vaddr,vma->vm_start,vma->vm_end); 1229 vaddr,vma->vm_start,vma->vm_end);
1230 if (vaddr > vma->vm_end) 1230 if (vaddr > vma->vm_end)
1231 return NOPAGE_SIGBUS; 1231 return NOPAGE_SIGBUS;
1232 page = alloc_page(GFP_USER); 1232 page = alloc_page(GFP_USER | __GFP_DMA32);
1233 if (!page) 1233 if (!page)
1234 return NOPAGE_OOM; 1234 return NOPAGE_OOM;
1235 clear_user_page(page_address(page), vaddr, page); 1235 clear_user_page(page_address(page), vaddr, page);