From 6585ae9ec31362f1507f588b30d7f1e2a56233ac Mon Sep 17 00:00:00 2001
From: Scott Jiang <[scott.jiang.linux@gmail.com]>
Date: Wed, 21 Sep 2011 09:25:23 -0300
Subject: [PATCH] --- yaml --- r: 273717 b: refs/heads/master c:
 6f524ec156ba31a18425fad9dd1287be0701d9d1 h: refs/heads/master i:   273715:
 1a3b116c3dbe5a90d36601c20a760f80ef5d275c v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/videobuf2-core.c | 31 ++++++++++++++++++++++
 trunk/include/media/videobuf2-core.h       |  7 +++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 04dded3d49d6..bb5119fb1bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa8dd3a05248457fce18712e7bc0499030b3100
+refs/heads/master: 6f524ec156ba31a18425fad9dd1287be0701d9d1
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
index 9005dc9991ab..979e544388cb 100644
--- a/trunk/drivers/media/video/videobuf2-core.c
+++ b/trunk/drivers/media/video/videobuf2-core.c
@@ -1567,6 +1567,37 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
 }
 EXPORT_SYMBOL_GPL(vb2_mmap);
 
+#ifndef CONFIG_MMU
+unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
+				    unsigned long addr,
+				    unsigned long len,
+				    unsigned long pgoff,
+				    unsigned long flags)
+{
+	unsigned long off = pgoff << PAGE_SHIFT;
+	struct vb2_buffer *vb;
+	unsigned int buffer, plane;
+	int ret;
+
+	if (q->memory != V4L2_MEMORY_MMAP) {
+		dprintk(1, "Queue is not currently set up for mmap\n");
+		return -EINVAL;
+	}
+
+	/*
+	 * Find the plane corresponding to the offset passed by userspace.
+	 */
+	ret = __find_plane_by_offset(q, off, &buffer, &plane);
+	if (ret)
+		return ret;
+
+	vb = q->bufs[buffer];
+
+	return (unsigned long)vb2_plane_vaddr(vb, plane);
+}
+EXPORT_SYMBOL_GPL(vb2_get_unmapped_area);
+#endif
+
 static int __vb2_init_fileio(struct vb2_queue *q, int read);
 static int __vb2_cleanup_fileio(struct vb2_queue *q);
 
diff --git a/trunk/include/media/videobuf2-core.h b/trunk/include/media/videobuf2-core.h
index 55c57d3d3e63..a15d1f1b319e 100644
--- a/trunk/include/media/videobuf2-core.h
+++ b/trunk/include/media/videobuf2-core.h
@@ -322,6 +322,13 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
 int vb2_streamoff(struct vb2_queue *q, enum v4l2_buf_type type);
 
 int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma);
+#ifndef CONFIG_MMU
+unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
+				    unsigned long addr,
+				    unsigned long len,
+				    unsigned long pgoff,
+				    unsigned long flags);
+#endif
 unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait);
 size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
 		loff_t *ppos, int nonblock);