1 |
commit: 443439142344878f77b7076980e94954dd080718 |
2 |
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 1 13:03:33 2012 +0000 |
4 |
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
5 |
CommitDate: Tue May 1 13:03:33 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=44343914 |
7 |
|
8 |
x11-drivers/ati-drivers: add kernel 3.4 support |
9 |
|
10 |
This should fix bug #413569. See also [1] |
11 |
|
12 |
[1] https://lkml.org/lkml/2012/4/10/485 |
13 |
|
14 |
--- |
15 |
x11-drivers/ati-drivers/ati-drivers-12.4.ebuild | 4 ++++ |
16 |
.../files/amd-cpu_possible_map_define.patch | 13 +++++++++++++ |
17 |
2 files changed, 17 insertions(+), 0 deletions(-) |
18 |
|
19 |
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild |
20 |
index 4b062be..679290c 100644 |
21 |
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild |
22 |
+++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild |
23 |
@@ -330,6 +330,10 @@ src_prepare() { |
24 |
# and finally backported to kernel 3.2.8. |
25 |
epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch |
26 |
|
27 |
+ # see https://lkml.org/lkml/2012/4/10/485 3.4.0-rc remove the define of |
28 |
+ # cpu_possible_map, we add it back temporary util AMD fixes |
29 |
+ epatch "${FILESDIR}"/amd-cpu_possible_map_define.patch |
30 |
+ |
31 |
cd "${MODULE_DIR}" |
32 |
|
33 |
# bugged fglrx build system, this file should be copied by hand |
34 |
|
35 |
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 |
36 |
new file mode 100644 |
37 |
index 0000000..5b3cb9a |
38 |
--- /dev/null |
39 |
+++ b/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch |
40 |
@@ -0,0 +1,13 @@ |
41 |
+--- common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2012-05-01 14:35:33.453055055 +0200 |
42 |
++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-01 14:36:42.184270842 +0200 |
43 |
+@@ -219,6 +219,10 @@ |
44 |
+ #define preempt_enable() |
45 |
+ #endif |
46 |
+ |
47 |
++#ifndef cpu_possible_map |
48 |
++#define cpu_possible_map (*(cpumask_t *)cpu_possible_mask) |
49 |
++#endif |
50 |
++ |
51 |
+ // ============================================================ |
52 |
+ /* globals */ |
53 |
+ |