lkml.org 
[lkml]   [1999]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] fbmem.c in 2.3.25-3
    diff -ur v2.3.25/drivers/video/fbmem.c
    linux/drivers/video/fbmem.c
    --- v2.3.25/drivers/video/fbmem.c Sun Oct 31 00:42:20
    1999
    +++ linux/drivers/video/fbmem.c Sun Oct 31 01:00:28 1999
    @@ -505,9 +505,9 @@
    len = (start & ~PAGE_MASK)+fix.smem_len;
    start &= PAGE_MASK;
    len = (len+~PAGE_MASK) & PAGE_MASK;
    - if (vma->vm_offset >= len) {
    + if (vma->vm_pgoff >= len) {
    /* memory mapped io */
    - vma->vm_offset -= len;
    + vma->vm_pgoff -= len;
    fb->fb_get_var(&var, PROC_CONSOLE(info), info);
    if (var.accel_flags)
    return -EINVAL;
    @@ -516,10 +516,10 @@
    start &= PAGE_MASK;
    len = (len+~PAGE_MASK) & PAGE_MASK;
    }
    - if ((vma->vm_end - vma->vm_start + vma->vm_offset) > len)
    + if ((vma->vm_end - vma->vm_start + vma->vm_pgoff) > len)
    return -EINVAL;
    - vma->vm_offset += start;
    - if (vma->vm_offset & ~PAGE_MASK)
    + vma->vm_pgoff += start;
    + if (vma->vm_pgoff & ~PAGE_MASK)
    return -ENXIO;
    #if defined(__mc68000__)
    if (CPU_IS_020_OR_030)
    @@ -549,7 +549,7 @@
    #else
    #warning What do we have to do here??
    #endif
    - if (io_remap_page_range(vma->vm_start, vma->vm_offset,
    + if (io_remap_page_range(vma->vm_start, vma->vm_pgoff,
    vma->vm_end - vma->vm_start, vma->vm_page_prot))
    return -EAGAIN;
    return 0;

    --
    Soren

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.rutgers.edu
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 13:54    [W:0.020 / U:238.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site