summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-11-09 06:01:59 +0000
committerMike Frysinger <vapier@gentoo.org>2005-11-09 06:01:59 +0000
commit773816d112cc0a08029bdd78a555f207730fbc2f (patch)
treede6a2ac94047cf37534dfd23ba849282545677b1 /media-libs/svgalib/files
parentBump with new CVS snapshot. (diff)
downloadgentoo-2-773816d112cc0a08029bdd78a555f207730fbc2f.tar.gz
gentoo-2-773816d112cc0a08029bdd78a555f207730fbc2f.tar.bz2
gentoo-2-773816d112cc0a08029bdd78a555f207730fbc2f.zip
fix support for new io_remap_pfn_range in linux-2.6.14+ properly with the help of Michael Cramer #111059
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-libs/svgalib/files')
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch21
1 files changed, 15 insertions, 6 deletions
diff --git a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
index c0fc1e2bc526..48d769116c4f 100644
--- a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
@@ -35,7 +35,7 @@
rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
--- svgalib/kernel/svgalib_helper/kernel26compat.h
+++ svgalib/kernel/svgalib_helper/kernel26compat.h
-@@ -10,9 +10,12 @@
+@@ -10,7 +10,7 @@
# define PCI_GET_CLASS pci_find_class
# define PCI_GET_DEVICE pci_find_device
@@ -43,9 +43,18 @@
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
# define my_io_remap_page_range(vma, start, ofs, len, prot) \
io_remap_page_range(vma,start,ofs,len,prot)
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
-+# define my_io_remap_page_range(vma, start, ofs, len, prot) \
-+ io_remap_pfn_range(vma,start,ofs,len,prot)
# else
- # ifdef __alpha__ /* Is alpha really the issue here ??? */
- # define my_io_remap_page_range(vma, start, ofs, len, prot) \
+@@ -50,8 +50,13 @@
+ # define DEVFS_MK_SYMLINK(a,b)
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ # define my_io_remap_page_range(vma, start, ofs, len, prot) \
+ io_remap_page_range(vma,start,ofs,len,prot)
++#else
++# define my_io_remap_page_range(vma, start, ofs, len, prot) \
++ io_remap_pfn_range(vma,start,ofs>>PAGE_SHIFT,len,prot)
++#endif
+
+ # define pci_present() 1
+