[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/

["Enrico Tagliavini" <enrico.tagliavini@gmail.com>]

commit:     443439142344878f77b7076980e94954dd080718
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Tue May  1 13:03:33 2012 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Tue May  1 13:03:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=44343914

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-drivers/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
 
+	# 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}"
 
 	# bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch 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 14: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
+ 
++#ifndef cpu_possible_map
++#define cpu_possible_map	(*(cpumask_t *)cpu_possible_mask)
++#endif
++
+ // ============================================================
+ /* globals */
+