On Fri, May 6, 2011 at 4:22 PM, Laurent Pinchart
<laurent.pinchart@xxxxxxxxxxxxxxxx> wrote:
> Hi Bob,
>
> On Friday 29 April 2011 12:11:34 Bob Liu wrote:
>> Revert commit:
>> V4L/DVB: v4l2-dev: remove get_unmapped_area(c29fcff3daafbf46d64a543c1950bb)
>> to restore NOMMU arch supporting.
>>
>> Signed-off-by: Bob Liu <lliubbo@xxxxxxxxx>
>
> git provides a 'git revert' command to revert patches. It formats the commit
Sorry, I haven't use 'git revert' before.
> message in a standard way. I'll use it instead of applying this patch to my
> tree and I'll keep your SoB line (unless you object to that).
>
Okay, Thanks a lot.
>> ---
>> Âdrivers/media/video/v4l2-dev.c | Â 18 ++++++++++++++++++
>> Âinclude/media/v4l2-dev.h    |  Â2 ++
>> Â2 files changed, 20 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/media/video/v4l2-dev.c
>> b/drivers/media/video/v4l2-dev.c index 6dc7196..19d5ae2 100644
>> --- a/drivers/media/video/v4l2-dev.c
>> +++ b/drivers/media/video/v4l2-dev.c
>> @@ -352,6 +352,23 @@ static long v4l2_ioctl(struct file *filp, unsigned int
>> cmd, unsigned long arg) return ret;
>> Â}
>>
>> +#ifdef CONFIG_MMU
>> +#define v4l2_get_unmapped_area NULL
>> +#else
>> +static unsigned long v4l2_get_unmapped_area(struct file *filp,
>> + Â Â Â Â Â Â unsigned long addr, unsigned long len, unsigned long pgoff,
>> + Â Â Â Â Â Â unsigned long flags)
>> +{
>> + Â Â struct video_device *vdev = video_devdata(filp);
>> +
>> + Â Â if (!vdev->fops->get_unmapped_area)
>> + Â Â Â Â Â Â return -ENOSYS;
>> + Â Â if (!video_is_registered(vdev))
>> + Â Â Â Â Â Â return -ENODEV;
>> + Â Â return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
>> +}
>> +#endif
>> +
>> Âstatic int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
>> Â{
>> Â Â Â struct video_device *vdev = video_devdata(filp);
>> @@ -454,6 +471,7 @@ static const struct file_operations v4l2_fops = {
>> Â Â Â .read = v4l2_read,
>> Â Â Â .write = v4l2_write,
>> Â Â Â .open = v4l2_open,
>> + Â Â .get_unmapped_area = v4l2_get_unmapped_area,
>> Â Â Â .mmap = v4l2_mmap,
>> Â Â Â .unlocked_ioctl = v4l2_ioctl,
>> Â#ifdef CONFIG_COMPAT
>> diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
>> index 8266d5a..93e96fb 100644
>> --- a/include/media/v4l2-dev.h
>> +++ b/include/media/v4l2-dev.h
>> @@ -62,6 +62,8 @@ struct v4l2_file_operations {
>> Â Â Â unsigned int (*poll) (struct file *, struct poll_table_struct *);
>> Â Â Â long (*ioctl) (struct file *, unsigned int, unsigned long);
>> Â Â Â long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
>> + Â Â unsigned long (*get_unmapped_area) (struct file *, unsigned long,
>> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long, unsigned long, unsigned long);
>> Â Â Â int (*mmap) (struct file *, struct vm_area_struct *);
>> Â Â Â int (*open) (struct file *);
>> Â Â Â int (*release) (struct file *);
>
> --
> Regards,
>
> Laurent Pinchart
>
--
Regards,
--Bob
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
