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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-04-27 19:52:24 +0000 (Wed, 27 Apr 2011)
New Revision: 580

Added:
   fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 07-2.6.39-support.diff to build with Linux 2.6.39.
  Closes: #620151


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-04-27 19:45:46 UTC (rev 579)
+++ fglrx-driver/trunk/debian/changelog	2011-04-27 19:52:24 UTC (rev 580)
@@ -3,8 +3,10 @@
   * New upstream release.
     - Remove merged patch 04-2.6.38-support.diff.
     - Refresh hunky patch 05-fix-global-kernel-lock.diff.
+  * Add patch 07-2.6.39-support.diff to build with Linux 2.6.39.
+    Closes: #620151
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 27 Apr 2011 21:34:59 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 27 Apr 2011 21:50:56 +0200
 
 fglrx-driver (1:11-3-1) unstable; urgency=low
 

Added: fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff	2011-04-27 19:52:24 UTC (rev 580)
@@ -0,0 +1,33 @@
+Description: Add Linux 2.6.39 support
+ <linux/spinlock_types.h> had the following comment until 2.6.38:
+ .
+ /*
+  * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence
+  * deprecated.
+  * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as
+  * appropriate.
+  */
+ #define SPIN_LOCK_UNLOCKED     __SPIN_LOCK_UNLOCKED(old_style_spin_init)
+ .
+ This definition got removed in 2.6.39. Restore it locally until it gets fixed
+ upstream.
+Author: Miguel Colon <debian.micove at gmail.com>
+Forwarded: no
+Last-Update: 2011-03-30
+
+diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:48:43.000000000 +0200
++++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:49:36.000000000 +0200
+@@ -1060,7 +1060,12 @@
+     dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
+ 
+     for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
+         dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
++#else
++        dev->spinlock[i] = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
++#endif
++
+ 
+     for (i=0; i < __KE_MAX_SEMAPHORES; i++)
+         sema_init(&dev->struct_sem[i], 1);

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-04-27 19:45:46 UTC (rev 579)
+++ fglrx-driver/trunk/debian/patches/series	2011-04-27 19:52:24 UTC (rev 580)
@@ -3,3 +3,4 @@
 03-authatieventsd.sh.diff
 05-fix-global-kernel-lock.diff
 06-no-smp-lock.diff
+07-2.6.39-support.diff