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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-03-29 18:43:09 +0000 (Tue, 29 Mar 2011)
New Revision: 574

Added:
   fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 06-no-smp-lock.diff from Richard Ratzer, which fixes a FTBFS, if
  the Kernel is built without BKL.
  Closes: #619952


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-03-29 18:36:43 UTC (rev 573)
+++ fglrx-driver/trunk/debian/changelog	2011-03-29 18:43:09 UTC (rev 574)
@@ -2,8 +2,11 @@
 
   * New upstream release.
     - Rediff hunky 02-dkms-arch_compat.diff.
+  * Add patch 06-no-smp-lock.diff from Richard Ratzer, which fixes a FTBFS, if
+    the Kernel is built without BKL.
+    Closes: #619952
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 29 Mar 2011 20:36:21 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 29 Mar 2011 20:41:40 +0200
 
 fglrx-driver (1:11-2-2) unstable; urgency=low
 

Added: fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff	2011-03-29 18:43:09 UTC (rev 574)
@@ -0,0 +1,39 @@
+# Do not include smp_lock.h if the Kernel is built without BKL.
+# Closes: #619952
+
+diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h
+--- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h	2011-03-24 17:00:28.000000000 +0100
++++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h	2011-03-29 20:39:05.000000000 +0200
+@@ -57,7 +57,11 @@
+ #include <linux/pci.h>
+ #include <linux/version.h>
+ #include <linux/sched.h>
++/* with no Big Kernel Lock and linux 2.6.38
++   and higher smp_lock.h is removed      */
++#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #include <linux/smp_lock.h>	/* For (un)lock_kernel */
++#endif
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #if defined(__alpha__) || defined(__powerpc__)
+diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-29 20:37:04.000000000 +0200
++++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-29 20:39:05.000000000 +0200
+@@ -116,7 +116,16 @@
+ #include <linux/pci.h>
+ #include <linux/wait.h>
+ #include <linux/miscdevice.h>
+-#include <linux/smp_lock.h>
++
++/* with no Big Kernel Lock and linux 2.6.38
++   and higher is smp_lock.h removed.
++   instead of smp_lock.h is sched.h required    */
++#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
++#include <linux/smp_lock.h>	/* For (un)lock_kernel */
++#else
++#include <linux/sched.h>
++#endif
++
+ // newer SuSE kernels need this
+ #include <linux/highmem.h>
+ 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-03-29 18:36:43 UTC (rev 573)
+++ fglrx-driver/trunk/debian/patches/series	2011-03-29 18:43:09 UTC (rev 574)
@@ -3,3 +3,4 @@
 03-authatieventsd.sh.diff
 04-2.6.38-support.diff
 05-fix-global-kernel-lock.diff
+06-no-smp-lock.diff