summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-12 22:26:32 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-12 22:26:32 -0200
commit844bc59031b6cff1a3cd1f5ba1f0e64a81cac924 (patch)
treea20a8d1d11df8fa667f73f9ee56a5c0060cb6263 /linux/drivers/media
parent10095e15fc642c3b39153fa85e4beb79dfa7926e (diff)
downloadmediapointer-dvb-s2-844bc59031b6cff1a3cd1f5ba1f0e64a81cac924.tar.gz
mediapointer-dvb-s2-844bc59031b6cff1a3cd1f5ba1f0e64a81cac924.tar.bz2
Fix bttv and friends on 64bit machines with lots of memory
From: Gerd Hoffmann <kraxel@novell.com> 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 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/video-buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c
index f1e7f298b..6d6a74c60 100644
--- a/linux/drivers/media/video/video-buf.c
+++ b/linux/drivers/media/video/video-buf.c
@@ -1240,7 +1240,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
vaddr,vma->vm_start,vma->vm_end);
if (vaddr > vma->vm_end)
return NOPAGE_SIGBUS;
- page = alloc_page(GFP_USER);
+ page = alloc_page(GFP_USER | __GFP_DMA32);
if (!page)
return NOPAGE_OOM;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,20)