Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6] / drivers / video / fb_defio.c

diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index f963f5f59b73377e7b534c96863cb9a5bd2eb4fa..1a8643f053d87af079ceb8b32e19e19a765892c9 100644 (file)
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -32,12 +32,14 @@ static struct page* fb_deferred_io_nopage(struct vm_area_struct *vma,
        unsigned long offset;
        struct page *page;
        struct fb_info *info = vma->vm_private_data;
+       /* info->screen_base is in System RAM */
+       void *screen_base = (void __force *) info->screen_base;
 
        offset = (vaddr - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
        if (offset >= info->fix.smem_len)
                return NOPAGE_SIGBUS;
 
-       page = vmalloc_to_page(info->screen_base + offset);
+       page = vmalloc_to_page(screen_base + offset);
        if (!page)
                return NOPAGE_OOM;