diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-01-03 16:20:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-07 19:18:54 -0500 |
commit | c0cd5010e54e52931c321ee66d81d10a8e2a9ff6 (patch) | |
tree | f21bfe54d568c84e6f807676a3f9227001f07adc | |
parent | 8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 (diff) |
V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage
Not all architectures provide clear_user_page(), but clear_user_highpage()
is available everywhere at least via the compatibility inline function.
Is this the "trivial patch" that's required for these two drivers?
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 3 | ||||
-rw-r--r-- | drivers/staging/go7007/go7007-v4l2.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index bc6d5aba0fe6..da1790e57a86 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -388,8 +388,7 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
388 | page = alloc_page(GFP_USER | __GFP_DMA32); | 388 | page = alloc_page(GFP_USER | __GFP_DMA32); |
389 | if (!page) | 389 | if (!page) |
390 | return VM_FAULT_OOM; | 390 | return VM_FAULT_OOM; |
391 | clear_user_page(page_address(page), (unsigned long)vmf->virtual_address, | 391 | clear_user_highpage(page, (unsigned long)vmf->virtual_address); |
392 | page); | ||
393 | vmf->page = page; | 392 | vmf->page = page; |
394 | return 0; | 393 | return 0; |
395 | } | 394 | } |
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c index 4f7237a03ad1..868edb65e7bf 100644 --- a/drivers/staging/go7007/go7007-v4l2.c +++ b/drivers/staging/go7007/go7007-v4l2.c | |||
@@ -1712,8 +1712,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
1712 | page = alloc_page(GFP_USER | __GFP_DMA32); | 1712 | page = alloc_page(GFP_USER | __GFP_DMA32); |
1713 | if (!page) | 1713 | if (!page) |
1714 | return VM_FAULT_OOM; | 1714 | return VM_FAULT_OOM; |
1715 | clear_user_page(page_address(page), (unsigned long)vmf->virtual_address, | 1715 | clear_user_highpage(page, (unsigned long)vmf->virtual_address); |
1716 | page); | ||
1717 | vmf->page = page; | 1716 | vmf->page = page; |
1718 | return 0; | 1717 | return 0; |
1719 | } | 1718 | } |