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 1SZ3K8-0007Ad-J1 for garchives@archives.gentoo.org; Mon, 28 May 2012 17:01:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2A4FE07FE; Mon, 28 May 2012 17:01:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6B33AE07FE for ; Mon, 28 May 2012 17:01:23 +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 902AD1B4083 for ; Mon, 28 May 2012 17:01:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 57990E5428 for ; Mon, 28 May 2012 17:01:21 +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: <1338224467.2d0f0cc2aa867203e15bf7cd2f57e5a447793681.Enrico@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch X-VCS-Directories: x11-drivers/ati-drivers/files/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: 2d0f0cc2aa867203e15bf7cd2f57e5a447793681 X-VCS-Branch: master Date: Mon, 28 May 2012 17:01:21 +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: 7bc1a4c5-9c50-4d68-89a7-898c0376b382 X-Archives-Hash: 9f136fd4f45b197276269d938190d96d commit: 2d0f0cc2aa867203e15bf7cd2f57e5a447793681 Author: Enrico Tagliavini gmail com> AuthorDate: Mon May 28 17:01:07 2012 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Mon May 28 17:01:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D2d0f0cc2 add missing patch ati-drivers-old_rsp.patch remove old --- .../ati-drivers/files/ati-drivers-old_rsp.patch | 24 ++++++++++++ .../files/ati-drivers-redefine-WARN.patch | 39 --------------= ------ 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x1= 1-drivers/ati-drivers/files/ati-drivers-old_rsp.patch new file mode 100644 index 0000000..321e5ed --- /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:3= 3:25.044695179 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:2= 8: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 C= PU # %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 =3D COMPAT_ALLOC_USER_SPACE(size); diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patc= h b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch deleted file mode 100644 index fe5ed2f..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2011-12-30 14:32= :00.271391437 +0100 -+++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2011-12-30 15:48:21.6= 47473696 +0100 -@@ -85,8 +85,8 @@ - #ifdef ERROR - #undef ERROR - #endif --#ifdef WARN --#undef WARN -+#ifdef AMD_WARN -+#undef AMD_WARN - #endif - #ifdef INFO - #undef INFO -@@ -122,7 +122,7 @@ - { - SPECIAL =3D 0, - ERROR , -- WARN , -+ AMD_WARN , - INFO , - INFOEX, - TRACE, -@@ -163,14 +163,14 @@ - { - {SPECIAL , 'S'}, - {ERROR , 'E'}, -- {WARN , 'W'}, -+ {AMD_WARN , 'W'}, - {INFO , 'I'}, - {INFOEX , 'X'}, - {TRACE , 'T'}, - {PERFORMANCE , 'P'}, - {DUMP , 'D'}, - }; --#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(= ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) -+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(= ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) - #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX))) - static module_map module_type_map[LOG_M_MAX] =3D - {