From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SiRni-0004ZC-HS for garchives@archives.gentoo.org; Sat, 23 Jun 2012 14:59:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9472221C054; Sat, 23 Jun 2012 14:58:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 54B2521C054 for ; Sat, 23 Jun 2012 14:58:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 798DB1B4025 for ; Sat, 23 Jun 2012 14:58:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3DA8AE5436 for ; Sat, 23 Jun 2012 14:58:48 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: <1340463514.b5689e3a5f9dfe40be6b007a0f0e6ba1bd53946a.Enrico@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-12.4.ebuild x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: b5689e3a5f9dfe40be6b007a0f0e6ba1bd53946a X-VCS-Branch: master Date: Sat, 23 Jun 2012 14:58:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f6bf116e-e716-43ee-85b4-9597117e43d0 X-Archives-Hash: ec12b2ef61714c712e4986c44729e1a7 commit: b5689e3a5f9dfe40be6b007a0f0e6ba1bd53946a Author: Enrico Tagliavini gmail com> AuthorDate: Sat Jun 23 14:58:34 2012 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sat Jun 23 14:58:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Db5689e3a x11-drivers/ati-drivers: add kernel 3.5 support This fixed bug #420751. Thank you very much to Fabio Rossi inwind.it> for testing the patch --- x11-drivers/ati-drivers/ati-drivers-12.4.ebuild | 2 +- .../ati-drivers/files/ati-drivers-do_mmap.patch | 55 ++++++++++++++= ++--- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-driver= s/ati-drivers/ati-drivers-12.4.ebuild index 112def6..dee9be0 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild @@ -333,7 +333,7 @@ src_prepare() { # see http://ati.cchtml.com/show_bug.cgi?id=3D495 epatch "${FILESDIR}"/ati-drivers-old_rsp.patch #fixes bug #420751 - #epatch "${FILESDIR}"/ati-drivers-do_mmap.patch + epatch "${FILESDIR}"/ati-drivers-do_mmap.patch =20 cd "${MODULE_DIR}" =20 diff --git a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch b/x1= 1-drivers/ati-drivers/files/ati-drivers-do_mmap.patch index 966346c..04248eb 100644 --- a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch +++ b/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch @@ -1,13 +1,50 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2012-06-15 1= 8:30:13.483762070 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:57:= 10.375817772 +0200 -@@ -219,6 +219,10 @@ - #define preempt_enable() - #endif +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:3= 0:13.483762070 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:4= 7:36.543041869 +0200 +@@ -2106,6 +2106,12 @@ + } + } =20 -+#ifndef do_mmap -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, (f) >> PAGE_SHIFT) ++#if LINUX_VERSION_CODE >=3D 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 + - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - /* globals */ + unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( + KCL_IO_FILE_Handle file, + unsigned long addr, +@@ -2117,10 +2123,13 @@ +=20 + flags =3D MAP_SHARED; + prot =3D PROT_READ|PROT_WRITE; +- ++#ifdef NO_DO_MMAP ++ vaddr =3D (void *) vm_mmap(file, 0, len, prot, flags, pgoff); ++#else + down_write(¤t->mm->mmap_sem); + vaddr =3D (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 =3D 0; +=20 ++#ifndef NO_DO_MMAP + down_write(¤t->mm->mmap_sem); ++#endif + #ifdef FGL_LINUX_RHEL_MUNMAP_API + retcode =3D do_munmap(current->mm, + addr, +@@ -2142,7 +2153,9 @@ + addr, + len); + #endif =20 ++#ifndef NO_DO_MMAP + up_write(¤t->mm->mmap_sem); ++#endif + return retcode; + } =20