rpms/catalyst-legacy-kmod/F-17 3.5-do_mmap.patch, NONE, 1.1 catalyst-legacy-kmod.spec, 1.1, 1.2 amd-3.5.0-missing_do_mmap.patch, 1.1, NONE
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv697
Modified Files:
catalyst-legacy-kmod.spec
Added Files:
3.5-do_mmap.patch
Removed Files:
amd-3.5.0-missing_do_mmap.patch
Log Message:
* Thu Nov 29 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
3.5-do_mmap.patch:
firegl_public.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE 3.5-do_mmap.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
+++ lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
@@ -2106,6 +2106,12 @@
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+# define NO_DO_MMAP
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
+# define do_munmap(a,b,c) vm_munmap(b, c)
+#endif
+
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
KCL_IO_FILE_Handle file,
unsigned long addr,
@@ -2117,10 +2123,13 @@
flags = MAP_SHARED;
prot = PROT_READ|PROT_WRITE;
-
+#ifdef NO_DO_MMAP
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
+#else
down_write(¤t->mm->mmap_sem);
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
up_write(¤t->mm->mmap_sem);
+#endif
if (IS_ERR(vaddr))
return 0;
else
@@ -2131,7 +2140,9 @@
{
int retcode = 0;
+#ifndef NO_DO_MMAP
down_write(¤t->mm->mmap_sem);
+#endif
#ifdef FGL_LINUX_RHEL_MUNMAP_API
retcode = do_munmap(current->mm,
addr,
@@ -2142,7 +2153,9 @@
addr,
len);
#endif
+#ifndef NO_DO_MMAP
up_write(¤t->mm->mmap_sem);
+#endif
return retcode;
}
Index: catalyst-legacy-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17/catalyst-legacy-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst-legacy-kmod.spec 29 Nov 2012 21:10:59 -0000 1.1
+++ catalyst-legacy-kmod.spec 29 Nov 2012 21:21:01 -0000 1.2
@@ -13,7 +13,7 @@
Name: catalyst-legacy-kmod
Version: 12.6
-Release: 0.1%{?dist}
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display legacy driver kernel module
Group: System Environment/Kernel
@@ -22,7 +22,7 @@
Source0:
http://www.linux-ati-drivers.homecall.co.uk/catalyst-legacy-kmod-data-%{v...
Source11: catalyst-kmodtool-excludekernel-filterfile
Patch0: compat_alloc-Makefile.patch
-Patch1: amd-3.5.0-missing_do_mmap.patch
+Patch1: 3.5-do_mmap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i686
@@ -99,6 +99,9 @@
%changelog
+* Thu Nov 29 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
+
* Fri Jul 06 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-0.1
- Based on xorg-x11-drv-catalyst
- Update to Catalyst legacy 12.6 beta (internal version 8.97.100.3)
--- amd-3.5.0-missing_do_mmap.patch DELETED ---