SOURCES: svgalib-sparc.patch - try to fix sparc on Linux >= 2.4.13

[qboosh]

Author: qboosh                       Date: Thu Jan 12 13:48:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- try to fix sparc on Linux >= 2.4.13

---- Files affected:
SOURCES:
   svgalib-sparc.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/svgalib-sparc.patch
diff -u SOURCES/svgalib-sparc.patch:1.1 SOURCES/svgalib-sparc.patch:1.2
--- SOURCES/svgalib-sparc.patch:1.1	Tue May 18 16:51:08 2004
+++ SOURCES/svgalib-sparc.patch	Thu Jan 12 14:48:39 2006
@@ -9,9 +9,9 @@
  	vma->vm_flags |= (VM_SHM | VM_LOCKED);
  	if (my_io_remap_page_range(vma, vma->vm_start, off,
  				vma->vm_end - vma->vm_start, vma->vm_page_prot, 0))
---- svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h.orig	2004-05-18 14:27:22.000000000 +0200
-+++ svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h	2004-05-18 14:29:13.000000000 +0200
-@@ -10,6 +10,9 @@
+--- svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h.orig	2005-11-04 23:33:00.000000000 +0100
++++ svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h	2006-01-12 14:47:39.000000000 +0100
+@@ -13,6 +13,9 @@
  # if defined (PG_chainlock)
  #  define my_io_remap_page_range(vma, start, ofs, len, prot) \
  		io_remap_page_range(vma,start,ofs,len,prot)
@@ -19,11 +19,19 @@
 +#  define my_io_remap_page_range(vma, from, to, size, prot, space) \
 +		io_remap_page_range(from,to,size,prot,space)
  # else
- #  define my_io_remap_page_range(vma, start, ofs, len, prot) \
- 		io_remap_page_range(start,ofs,len,prot)
-@@ -28,8 +31,13 @@
- #  define KERNEL_2_6
- # endif
+ #  ifdef __alpha__ /* Is alpha really the issue here ??? */
+ #   define my_io_remap_page_range(vma, start, ofs, len, prot) \
+@@ -48,12 +51,21 @@
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
++# if defined(__sparc__) || defined(__sparc_v9__)
++#  define io_remap_page_range(vma, vaddr, paddr, size, prot, space) \
++	io_remap_pfn_range(vma, vaddr, MK_IOSPACE_PFN(space, ((paddr) >> PAGE_SHIFT)), size, prot)
++# else
+ # define io_remap_page_range(vma, vaddr, paddr, size, prot) \
+ 	remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
+ #endif
  
 +# if defined(__sparc__) || defined(__sparc_v9__)
 +#  define my_io_remap_page_range(vma, from, to, size, prot, space) \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/svgalib-sparc.patch?r1=1.1&r2=1.2&f=u