Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / video / omap2 / omapfb / omapfb-main.c

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index fadb1be..46a2c11 100644 (file)
--- 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);
 
@@ -1400,9 +1403,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
 
        size = PAGE_ALIGN(size);
 
-       WARN_ONCE(paddr,
-               "reserving memory at predefined address not supported\n");
-
        dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
 
        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
@@ -1584,6 +1584,9 @@ static int omapfb_parse_vram_param(const char *param, int max_entries,
 
                }
 
+               WARN_ONCE(paddr,
+                       "reserving memory at predefined address not supported\n");
+
                paddrs[fbnum] = paddr;
                sizes[fbnum] = size;