patch-2.4.4 linux/drivers/video/sbusfb.c

• Lines: 54
• Date: Thu Apr 26 22:17:27 2001
• Orig file: v2.4.3/linux/drivers/video/sbusfb.c
• Orig date: Sun Mar 25 18:14:20 2001

diff -u --recursive --new-file v2.4.3/linux/drivers/video/sbusfb.c linux/drivers/video/sbusfb.c
@@ -9,7 +9,7 @@
  *
  *  and SPARC console subsystem
  *
- *      Copyright (C) 1995 Peter Zaitcev (zaitcev@lab.ipmce.su)
+ *      Copyright (C) 1995 Peter Zaitcev (zaitcev@yahoo.com)
  *      Copyright (C) 1995-1997 David S. Miller (davem@caip.rutgers.edu)
  *      Copyright (C) 1995-1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
  *      Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)
@@ -193,44 +193,6 @@
 	/* To stop the swapper from even considering these pages */
 	vma->vm_flags |= (VM_SHM| VM_LOCKED);
 	
-#ifdef __sparc_v9__
-	/* Align it as much as desirable */
-	{
-		unsigned long j, alignment, s = 0;
-		int max = -1;
-		
-		map_offset = (vma->vm_pgoff << PAGE_SHIFT) + size;
-		for (i = 0; fb->mmap_map[i].size; i++) {
-			if (fb->mmap_map[i].voff < off)
-				continue;
-			if (fb->mmap_map[i].voff >= map_offset)
-				break;
-			if (max < 0 || sbusfb_mmapsize(fb,fb->mmap_map[i].size) > s) {
-				max = i;
-				s = sbusfb_mmapsize(fb,fb->mmap_map[max].size);
-			}
-		}
-		if (max >= 0) {
-			j = s;
-			if (fb->mmap_map[max].voff + j > map_offset)
-				j = map_offset - fb->mmap_map[max].voff;
-			for (alignment = 0x400000; alignment > PAGE_SIZE; alignment >>= 3)
-				if (j >= alignment && !(fb->mmap_map[max].poff & (alignment - 1)))
-					break;
-			if (alignment > PAGE_SIZE) {
-				j = alignment;
-				alignment = j - ((vma->vm_start + fb->mmap_map[max].voff - off) & (j - 1));
-				if (alignment != j) {
-					struct vm_area_struct *vmm = find_vma(current->mm, vma->vm_start);
-					if (!vmm || vmm->vm_start >= vma->vm_end + alignment) {
-						vma->vm_start += alignment;
-						vma->vm_end += alignment;
-					}
-				}
-			}
-		}
-	}
-#endif	
 
 	/* Each page, see which map applies */
 	for (page = 0; page < size; ){