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 1SPCkJ-0000JG-2N for garchives@archives.gentoo.org; Tue, 01 May 2012 13:03:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29934E0772; Tue, 1 May 2012 13:03:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F13D6E0772 for ; Tue, 1 May 2012 13:03:51 +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 47A681B4029 for ; Tue, 1 May 2012 13:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0A5AEE5403 for ; Tue, 1 May 2012 13:03:50 +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: <1335877413.443439142344878f77b7076980e94954dd080718.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/amd-cpu_possible_map_define.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: 443439142344878f77b7076980e94954dd080718 X-VCS-Branch: master Date: Tue, 1 May 2012 13:03:50 +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: 0245f06b-e8a0-4672-bc46-1c7bdf5bb4c0 X-Archives-Hash: 8e279e02d0cdc935b06ce2b394de02ae commit: 443439142344878f77b7076980e94954dd080718 Author: Enrico Tagliavini gmail com> AuthorDate: Tue May 1 13:03:33 2012 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Tue May 1 13:03:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D44343914 x11-drivers/ati-drivers: add kernel 3.4 support This should fix bug #413569. See also [1] [1] https://lkml.org/lkml/2012/4/10/485 --- x11-drivers/ati-drivers/ati-drivers-12.4.ebuild | 4 ++++ .../files/amd-cpu_possible_map_define.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 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 4b062be..679290c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild @@ -330,6 +330,10 @@ src_prepare() { # and finally backported to kernel 3.2.8. epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch =20 + # see https://lkml.org/lkml/2012/4/10/485 3.4.0-rc remove the define of + # cpu_possible_map, we add it back temporary util AMD fixes + epatch "${FILESDIR}"/amd-cpu_possible_map_define.patch + cd "${MODULE_DIR}" =20 # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.pa= tch b/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch new file mode 100644 index 0000000..5b3cb9a --- /dev/null +++ b/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch @@ -0,0 +1,13 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2012-05-01 1= 4:35:33.453055055 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-01 14:36:= 42.184270842 +0200 +@@ -219,6 +219,10 @@ + #define preempt_enable() + #endif +=20 ++#ifndef cpu_possible_map ++#define cpu_possible_map (*(cpumask_t *)cpu_possible_mask) ++#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 */ +=20