lkml.org 
[lkml]   [1999]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fbmem.c on 2.3.25 (had trouble with the other one)
Date
Here's a patch to fix a compile error for fbmem.c - vm_offset is gone. I
tried Ian Baird's patch, but it didn't work - all the hunks failed. So I
wrote my own - and it works. If Ian's doesn't work for you, try mine, and
vice versa.
=) d--- linux-2.3.25/drivers/video/fbmem.c Wed Nov 3 18:31:02 1999
+++ linux/drivers/video/fbmem.c Wed Nov 3 18:26:01 1999
@@ -503,25 +503,25 @@
/* frame buffer memory */
start = fix.smem_start;
len = (start & ~PAGE_MASK)+fix.smem_len;
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
- if (vma->vm_pgoff >= len) {
+ if (vma->vm_offset >= len) {
/* memory mapped io */
- vma->vm_pgoff -= len;
+ vma->vm_offset -= len;
fb->fb_get_var(&var, PROC_CONSOLE(info), info);
if (var.accel_flags)
return -EINVAL;
start = fix.mmio_start;
len = (start & ~PAGE_MASK)+fix.mmio_len;
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
}
- if ((vma->vm_end - vma->vm_start + vma->vm_pgoff) > len)
+ if ((vma->vm_end - vma->vm_start + vma->vm_offset) > len)
return -EINVAL;
- vma->vm_pgoff += start;
- if (vma->vm_pgoff & ~PAGE_MASK)
+ vma->vm_offset += start;
+ if (vma->vm_offset & ~PAGE_MASK)
return -ENXIO;
#if defined(__mc68000__)
if (CPU_IS_020_OR_030)
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
if (CPU_IS_040_OR_060) {
@@ -547,11 +547,11 @@
pgprot_val(vma->vm_page_prot) &= ~(PTE_CACHEABLE | PTE_BUFFERABLE);
#endif
#else
#warning What do we have to do here??
#endif
- if (io_remap_page_range(vma->vm_start, vma->vm_pgoff,
+ if (io_remap_page_range(vma->vm_start, vma->vm_offset,
vma->vm_end - vma->vm_start, vma->vm_page_prot))
return -EAGAIN;
return 0;

#endif /* defined(__sparc__) */
\
 
 \ /
  Last update: 2005-03-22 13:54    [from the cache]
©2003-2011 Jasper Spaans