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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-03-18 23:43:36 +0000 (Fri, 18 Mar 2011)
New Revision: 570

Added:
   fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
1:11-2-2

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-02-27 11:50:43 UTC (rev 569)
+++ fglrx-driver/trunk/debian/changelog	2011-03-18 23:43:36 UTC (rev 570)
@@ -1,3 +1,10 @@
+fglrx-driver (1:11-2-2) unstable; urgency=low
+
+  * Apply patch to support missing kernel lock in linux 2.6.38 (closes:
+    #618831).
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 18 Mar 2011 18:34:50 -0400
+
 fglrx-driver (1:11-2-1) unstable; urgency=medium
 
   * New upstream release.

Added: fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff	2011-03-18 23:43:36 UTC (rev 570)
@@ -0,0 +1,22 @@
+Description: add support for missing kernel lock
+Author: Pascal Giard <evilynux at gmail.com>
+--- fglrx-driver-11-2/common/lib/modules/fglrx/build_mod/firegl_public.c.old	2011-03-18 14:51:25.000000000 -0400
++++ fglrx-driver-11-2/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-18 14:52:33.000000000 -0400
+@@ -1913,13 +1913,17 @@
+ /** \brief Grab global kernel lock */
+ void ATI_API_CALL KCL_GlobalKernelLock(void)
+ {
++#ifdef CONFIG_KERNEL_LOCK
+     lock_kernel();
++#endif
+ }
+ 
+ /** \brief Release global kernel lock */
+ void ATI_API_CALL KCL_GlobalKernelUnlock(void)
+ {
++#ifdef CONFIG_KERNEL_LOCK
+     unlock_kernel();
++#endif
+ }
+ 
+ /*****************************************************************************/

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-02-27 11:50:43 UTC (rev 569)
+++ fglrx-driver/trunk/debian/patches/series	2011-03-18 23:43:36 UTC (rev 570)
@@ -2,3 +2,4 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
 04-2.6.38-support.diff
+05-fix-global-kernel-lock.diff