From 91cd40d711361626fb3aa604c54bf2696d53d50f Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 8 May 2007 00:38:44 -0700 Subject: [PATCH] --- yaml --- r: 54918 b: refs/heads/master c: 98a1153acdc2256f866599be701439577da77db3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fb_defio.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9838e5ae253..163291a506cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 895bf69b8f24907f0efa11d8e84a7eac8e47bdac +refs/heads/master: 98a1153acdc2256f866599be701439577da77db3 diff --git a/trunk/drivers/video/fb_defio.c b/trunk/drivers/video/fb_defio.c index f963f5f59b73..1a8643f053d8 100644 --- a/trunk/drivers/video/fb_defio.c +++ b/trunk/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;