Merge drm/drm-fixes into drm-misc-fixes

[platform/kernel/linux-rpi.git] / drivers / video / fbdev / core / fb_defio.c

diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
index a3cf1f7..274f5d0 100644 (file)
--- a/drivers/video/fbdev/core/fb_defio.c
+++ b/drivers/video/fbdev/core/fb_defio.c
@@ -157,10 +157,6 @@ static vm_fault_t fb_deferred_io_track_page(struct fb_info *info, unsigned long
        /* protect against the workqueue changing the page list */
        mutex_lock(&fbdefio->lock);
 
-       /* first write in this cycle, notify the driver */
-       if (fbdefio->first_io && list_empty(&fbdefio->pagereflist))
-               fbdefio->first_io(info);
-
        pageref = fb_deferred_io_pageref_get(info, offset, page);
        if (WARN_ON_ONCE(!pageref)) {
                ret = VM_FAULT_OOM;
@@ -232,9 +228,9 @@ static const struct address_space_operations fb_deferred_io_aops = {
 int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
        vma->vm_ops = &fb_deferred_io_vm_ops;
-       vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+       vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
        if (!(info->flags & FBINFO_VIRTFB))
-               vma->vm_flags |= VM_IO;
+               vm_flags_set(vma, VM_IO);
        vma->vm_private_data = info;
        return 0;
 }