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

Next file: linux/drivers/video/sgivwfb.c
Previous file: linux/drivers/video/promcon.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.3/linux/drivers/video/sbusfb.c linux/drivers/video/sbusfb.c
@@ -229,7 +229,12 @@
 		for (i = 0; fb->mmap_map[i].size; i++)
 			if (fb->mmap_map[i].voff == vma->vm_offset+page) {
 				map_size = sbusfb_mmapsize(fb,fb->mmap_map[i].size);
-				map_offset = (fb->physbase + fb->mmap_map[i].poff) & PAGE_MASK;
+#ifdef __sparc_v9__
+#define POFF_MASK	(PAGE_MASK|0x1UL)
+#else
+#define POFF_MASK	(PAGE_MASK)
+#endif				
+				map_offset = (fb->physbase + fb->mmap_map[i].poff) & POFF_MASK;
 				break;
 			}
 		if (!map_size){

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)