diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-05-28 09:12:53 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-05-28 09:12:53 +0000 |
| commit | 48d16b6febebd955f2eb461a9e4884740f3ca6fb (patch) | |
| tree | 08f693d67f99a0cfd1ee0c5d841035df8ffb5b68 /x11-drivers/ati-drivers | |
| parent | Remove older that refused to build. Bump latest to eapi4. (diff) | |
| download | gentoo-2-48d16b6febebd955f2eb461a9e4884740f3ca6fb.tar.gz gentoo-2-48d16b6febebd955f2eb461a9e4884740f3ca6fb.tar.bz2 gentoo-2-48d16b6febebd955f2eb461a9e4884740f3ca6fb.zip | |
Add a patch for 3.4 kernel build, proxying for Enrico.
(Portage version: 2.2.0_alpha107_p2/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers/ati-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-12.4.ebuild | 5 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch | 24 |
3 files changed, 33 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 81362ca3534a..f37980c1d432 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.283 2012/05/21 12:21:50 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.284 2012/05/28 09:12:53 mgorny Exp $ + + 28 May 2012; Michał Górny <mgorny@gentoo.org> ati-drivers-12.4.ebuild, + +files/ati-drivers-old_rsp.patch: + Add a patch for 3.4 kernel build, proxying for Enrico. 21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> ati-drivers-12.4.ebuild: x86 stable wrt bug #414609 diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild index 4a068af7b133..d6e9ce128cbf 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild,v 1.3 2012/05/21 12:21:50 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild,v 1.4 2012/05/28 09:12:53 mgorny Exp $ EAPI=4 @@ -330,6 +330,9 @@ src_prepare() { # and finally backported to kernel 3.2.8. epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch + # see http://ati.cchtml.com/show_bug.cgi?id=495 + epatch "${FILESDIR}"/ati-drivers-old_rsp.patch + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch new file mode 100644 index 000000000000..0456bd6b2f94 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch @@ -0,0 +1,24 @@ +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:33:25.044695179 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:28:39.692699095 +0200
+@@ -4154,7 +4154,7 @@
+ {
+ unsigned int p;
+ KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+- for_each_cpu_mask(p, cpu_possible_map)
++ for_each_possible_cpu(p)
+ {
+ KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
+ preempt_disable();
+--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:11:03.402987821 +0200
++++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:13:00.273986422 +0200
+@@ -217,6 +217,10 @@
+ * \param size [in] Number of bytes to allocate
+ * \return Pointer to allocated memory
+ */
++#ifndef CONFIG_X86_X32
++DEFINE_PER_CPU(unsigned long, old_rsp);
++#endif
++
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
+ void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file |