[Pkg-fglrx-devel] r995 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-07-27 07:04:43 +0000 (Fri, 27 Jul 2012)
New Revision: 995

Removed:
   fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
- Drop patch 01-fglrx_kernel_3.4.0, it has been merged by upstream.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-07-27 07:00:41 UTC (rev 994)
+++ fglrx-driver/trunk/debian/changelog	2012-07-27 07:04:43 UTC (rev 995)
@@ -8,6 +8,7 @@
     driver based on internal version 8.982.13.
     - X11 crashes on amd64 are fixed.
       Closes: #675940
+    - Drop patch 01-fglrx_kernel_3.4.0, it has been merged by upstream.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 21 Jul 2012 17:31:58 +0200
 

Deleted: fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch	2012-07-27 07:00:41 UTC (rev 994)
+++ fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch	2012-07-27 07:04:43 UTC (rev 995)
@@ -1,42 +0,0 @@
-Author: leigh scott <leigh123linux at googlemail.com>
-Origin: vendor, http://cvs.rpmfusion.org/viewvc/rpms/catalyst-kmod/F-16/fglrx_kernel_3.4.0.patch?revision=1.3&root=nonfree&view=markup
-Description: fix fglrx-driver build with kernel 3.4
-Bug-Debian: http://bugs.debian.org/678184
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -187,6 +187,9 @@
- #include <linux/gfp.h>
- #include <linux/swap.h>
- #include "asm/i387.h"
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+#include <asm/fpu-internal.h>
-+#endif
- 
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
-@@ -4181,7 +4184,11 @@ static int kasInitExecutionLevels(unsigned long level_init)
- {
-     unsigned int p;
-     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+    for_each_possible_cpu(p)
-+#else
-     for_each_cpu_mask(p, cpu_possible_map)
-+#endif
-     {
-         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
-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c
-@@ -217,6 +217,10 @@
-  *  \param size [in] Number of bytes to allocate
-  *  \return Pointer to allocated memory
-  */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+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);

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2012-07-27 07:00:41 UTC (rev 994)
+++ fglrx-driver/trunk/debian/patches/series	2012-07-27 07:04:43 UTC (rev 995)
@@ -1,3 +1,2 @@
-01-fglrx_kernel_3.4.0.patch
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff