From d15e7f689e69feda3599511a335c0ea57d1edce0 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sat, 7 Feb 2015 23:56:50 +0200 Subject: [PATCH] OMAPFB: don't mark framebuffer as IO memory because it isn't --- drivers/video/omap2/omapfb/omapfb-main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 55a67c40dc52..46a2c110ff57 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -1126,13 +1126,16 @@ static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); vma->vm_ops = &mmap_user_ops; vma->vm_private_data = rg; - if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) { + if (remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, + vma->vm_page_prot)) { r = -EAGAIN; goto error; } + /* not IO memory */ + vma->vm_flags &= ~VM_IO; + /* vm_ops.open won't be called for mmap itself. */ atomic_inc(&rg->map_count); -- 2.30.2