]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory
authorGerd Hoffmann <kraxel@novell.com>
Sat, 13 Jan 2007 00:26:32 +0000 (21:26 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 15 Jan 2007 18:26:01 +0000 (16:26 -0200)
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>
drivers/media/video/video-buf.c

index f429f49901b9a0394980f1aea61f2715eb9ddc63..635d102c86f0e5945ec6d19afadf5743dcc5a037 100644 (file)
@@ -1229,7 +1229,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;
        clear_user_page(page_address(page), vaddr, page);