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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-06-30 19:22:29 +0000 (Sat, 30 Jun 2012)
New Revision: 952

Added:
   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:
really fix build for kernel 3.4

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-06-30 19:05:29 UTC (rev 951)
+++ fglrx-driver/trunk/debian/changelog	2012-06-30 19:22:29 UTC (rev 952)
@@ -13,6 +13,8 @@
   * fglrx-driver.postrm: Present a debconf note if the driver was removed, but
     it is still enabled in xorg.conf(.d/).
   * control, rules: Add debconf infrastructure.
+  * 01-fglrx_kernel_3.4.0.patch: New patch from Fedora, fix kernel module
+    build for kernel 3.4.  (Closes: #678184)
 
   [ Debconf translations ]
   * Czech (cs): Michal Simunek              (Closes: #678678)
@@ -29,8 +31,7 @@
 fglrx-driver (1:12-6-1) unstable; urgency=low
 
   [ Michael Gilbert ]
-  * New upstream release:
-    - Kernel module now builds on linux 3.4 (closes: #678184).
+  * New upstream release.
 
   [ Andreas Beckmann ]
   * fglrx-driver: Add NEWS entry about dropped R6XX/R7XX support.

Added: fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.4.0.patch	2012-06-30 19:22:29 UTC (rev 952)
@@ -0,0 +1,42 @@
+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-06-30 19:05:29 UTC (rev 951)
+++ fglrx-driver/trunk/debian/patches/series	2012-06-30 19:22:29 UTC (rev 952)
@@ -1,2 +1,3 @@
+01-fglrx_kernel_3.4.0.patch
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff