summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorArjan van de Ven <arjanv@infradead.org>2004-10-27 18:25:43 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-27 18:25:43 -0700
commite1f40fc0cf09f591b474a0c17fc4e5ca7438c7dd (patch)
tree9f767cf3b4ab8a74038a61cd10f50537ad6f15f7 /drivers/media
parent0e5079135a7ac864ca6f9135bbbb8de0f5191e85 (diff)
[PATCH] vmalloc_to_page helper
After William did the remap_pfn_range change, a very common pattern became: page = page_to_pfn(vmalloc_to_page((void *)pos)); if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) { the patch below adds a very simple helper, vmalloc_to_pfn() to simplify this a bit. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cpia.c2
-rw-r--r--drivers/media/video/meye.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 7b337f121acd..f3206751a326 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3781,7 +3781,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
pos = (unsigned long)(cam->frame_buf);
while (size > 0) {
- page = page_to_pfn(vmalloc_to_page((void *)pos));
+ page = vmalloc_to_pfn((void *)pos);
if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
up(&cam->busy_lock);
return -EAGAIN;
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 466c1ce9e0f2..7174fc934c6b 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1188,7 +1188,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) {
pos = (unsigned long)meye.grab_fbuffer;
while (size > 0) {
- page = page_to_pfn(vmalloc_to_page((void *)pos));
+ page = vmalloc_to_pfn((void *)pos);
if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
up(&meye.lock);
return -EAGAIN;