3:39 a.m.
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27494
Modified Files:
.cvsignore catalyst-kmod.spec sources
Added Files:
3.5-do_mmap.patch
Removed Files:
catalyst-kmod-i386.patch fglrx_kernel_3.4.0.patch
rename_debug.patch
Log Message:
* Sat Oct 20 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: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Apr 2012 12:43:19 -0000 1.9
+++ .cvsignore 20 Oct 2012 03:39:42 -0000 1.10
@@ -1 +1 @@
-catalyst-kmod-data-12.4.tar.bz2
+catalyst-kmod-data-12.6.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- catalyst-kmod.spec 18 Oct 2012 18:43:51 -0000 1.68
+++ catalyst-kmod.spec 20 Oct 2012 03:39:42 -0000 1.69
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 12.4
-Release: 4%{?dist}.13
+Version: 12.6
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -22,9 +22,8 @@
Source0:
http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve...
Source11: catalyst-kmodtool-excludekernel-filterfile
Patch0: compat_alloc-Makefile.patch
-Patch1: rename_debug.patch
-Patch2: catalyst-kmod-i386.patch
-Patch3: fglrx_kernel_3.4.0.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
@@ -70,11 +69,7 @@
pushd fglrxpkg
%patch0 -p0 -b.compat_alloc
-%patch1 -p0 -b.rename_debug
-%patch3 -p0 -b.fglrx_kernel_3.4.0
-%ifarch %{ix86}
-%patch2 -p0 -b.catalyst-kmod-i386
-%endif
+%patch1 -p0 -b.3.5-do_mmap
popd
for kernel_version in %{?kernel_versions} ; do
@@ -105,6 +100,9 @@
%changelog
+* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
+
* Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.4-4.13
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Apr 2012 12:43:19 -0000 1.9
+++ sources 20 Oct 2012 03:39:42 -0000 1.10
@@ -1 +1 @@
-a7435617867b5bdef827ecf3d46902c4 catalyst-kmod-data-12.4.tar.bz2
+8e414e62c1df2835f823a8c188765ede catalyst-kmod-data-12.6.tar.bz2
--- catalyst-kmod-i386.patch DELETED ---
--- fglrx_kernel_3.4.0.patch DELETED ---
--- rename_debug.patch DELETED ---