This patch fixes some compile errors due
to residual vm_offset usage in:
drivers/char/drm/proc.c
drivers/char/drm/vm.c
drivers/video/fbmem.c
John Ellson
--------------1EE8123CE8AC53D0F5240DB3
Content-Type: text/plain; charset=us-ascii;
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="diff"
*** drivers/char/drm/proc.c.orig Tue Nov 2 10:27:49 1999
--- drivers/char/drm/proc.c Tue Nov 2 10:27:57 1999
***************
*** 382,388 ****
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
! vma->vm_offset );
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
--- 382,388 ----
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
! vma->vm_pgoff );
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
*** drivers/char/drm/vm.c.orig Tue Nov 2 10:29:02 1999
--- drivers/char/drm/vm.c Tue Nov 2 10:29:25 1999
***************
*** 96,102 ****
if (address > vma->vm_end) return 0; /* Disallow mremap */
if (!dma->pagelist) return 0; /* Nothing allocated */
! offset = address - vma->vm_start; /* vm_offset should be 0 */
page = offset >> PAGE_SHIFT;
physical = dma->pagelist[page] + (offset & (~PAGE_MASK));
atomic_inc(&mem_map[MAP_NR(physical)].count); /* Dec. by kernel */
--- 96,102 ----
if (address > vma->vm_end) return 0; /* Disallow mremap */
if (!dma->pagelist) return 0; /* Nothing allocated */
! offset = address - vma->vm_start; /* vm_pgoff should be 0 */
page = offset >> PAGE_SHIFT;
physical = dma->pagelist[page] + (offset & (~PAGE_MASK));
atomic_inc(&mem_map[MAP_NR(physical)].count); /* Dec. by kernel */
***************
*** 169,175 ****
unsigned long length = vma->vm_end - vma->vm_start;
DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
! vma->vm_start, vma->vm_end, vma->vm_offset);
/* Length must match exact page count */
if ((length >> PAGE_SHIFT) != dma->page_count) return -EINVAL;
--- 169,175 ----
unsigned long length = vma->vm_end - vma->vm_start;
DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
! vma->vm_start, vma->vm_end, vma->vm_pgoff);
/* Length must match exact page count */
if ((length >> PAGE_SHIFT) != dma->page_count) return -EINVAL;
***************
*** 195,203 ****
int i;
DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
! vma->vm_start, vma->vm_end, vma->vm_offset);
! if (!vma->vm_offset) return drm_mmap_dma(filp, vma);
/* A sequential search of a linked list is
fine here because: 1) there will only be
--- 195,203 ----
int i;
DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
! vma->vm_start, vma->vm_end, vma->vm_pgoff);
! if (!vma->vm_pgoff) return drm_mmap_dma(filp, vma);
/* A sequential search of a linked list is
fine here because: 1) there will only be
***************
*** 208,214 ****
bit longer. */
for (i = 0; i < dev->map_count; i++) {
map = dev->maplist[i];
! if (map->offset == vma->vm_offset) break;
}
if (i >= dev->map_count) return -EINVAL;
--- 208,214 ----
bit longer. */
for (i = 0; i < dev->map_count; i++) {
map = dev->maplist[i];
! if (map->offset == vma->vm_pgoff) break;
}
if (i >= dev->map_count) return -EINVAL;
***************
*** 222,228 ****
switch (map->type) {
case _DRM_FRAME_BUFFER:
case _DRM_REGISTERS:
! if (vma->vm_offset >= __pa(high_memory)) {
#if defined(__i386__)
if (boot_cpu_data.x86 > 3) {
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
--- 222,228 ----
switch (map->type) {
case _DRM_FRAME_BUFFER:
case _DRM_REGISTERS:
! if (vma->vm_pgoff >= __pa(high_memory)) {
#if defined(__i386__)
if (boot_cpu_data.x86 > 3) {
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
***************
*** 232,238 ****
vma->vm_flags |= VM_IO; /* not in core dump */
}
if (remap_page_range(vma->vm_start,
! vma->vm_offset,
vma->vm_end - vma->vm_start,
vma->vm_page_prot))
return -EAGAIN;
--- 232,238 ----
vma->vm_flags |= VM_IO; /* not in core dump */
}
if (remap_page_range(vma->vm_start,
! vma->vm_pgoff,
vma->vm_end - vma->vm_start,
vma->vm_page_prot))
return -EAGAIN;
*** drivers/video/fbmem.c.orig Tue Nov 2 10:17:53 1999
--- drivers/video/fbmem.c Tue Nov 2 10:18:14 1999
***************
*** 505,513 ****
len = (start & ~PAGE_MASK)+fix.smem_len;
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
! if (vma->vm_offset >= len) {
/* memory mapped io */
! vma->vm_offset -= len;
fb->fb_get_var(&var, PROC_CONSOLE(info), info);
if (var.accel_flags)
return -EINVAL;
--- 505,513 ----
len = (start & ~PAGE_MASK)+fix.smem_len;
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
! if (vma->vm_pgoff >= len) {
/* memory mapped io */
! vma->vm_pgoff -= len;
fb->fb_get_var(&var, PROC_CONSOLE(info), info);
if (var.accel_flags)
return -EINVAL;
***************
*** 516,525 ****
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
}
! if ((vma->vm_end - vma->vm_start + vma->vm_offset) > len)
return -EINVAL;
! vma->vm_offset += start;
! if (vma->vm_offset & ~PAGE_MASK)
return -ENXIO;
#if defined(__mc68000__)
if (CPU_IS_020_OR_030)
--- 516,525 ----
start &= PAGE_MASK;
len = (len+~PAGE_MASK) & PAGE_MASK;
}
! if ((vma->vm_end - vma->vm_start + vma->vm_pgoff) > len)
return -EINVAL;
! vma->vm_pgoff += start;
! if (vma->vm_pgoff & ~PAGE_MASK)
return -ENXIO;
#if defined(__mc68000__)
if (CPU_IS_020_OR_030)
***************
*** 549,555 ****
#else
#warning What do we have to do here??
#endif
! 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;
--- 549,555 ----
#else
#warning What do we have to do here??
#endif
! 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;
--------------1EE8123CE8AC53D0F5240DB3--
-
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/