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

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-03-08 19:46:56 +0000 (Thu, 08 Mar 2012)
New Revision: 872

Added:
   fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 04-x86-ftbfs to fix a FTBFS with Linux >= 3.2.8 on 32bit systems.
  Closes: #663107


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-03-07 19:38:47 UTC (rev 871)
+++ fglrx-driver/trunk/debian/changelog	2012-03-08 19:46:56 UTC (rev 872)
@@ -1,3 +1,10 @@
+fglrx-driver (1:12-2-2) UNRELEASED; urgency=low
+
+  * Add patch 04-x86-ftbfs to fix a FTBFS with Linux >= 3.2.8 on 32bit systems.
+    Closes: #663107
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 08 Mar 2012 20:45:15 +0100
+
 fglrx-driver (1:12-2-1) unstable; urgency=low
 
   [ Patrick Matthäi ]

Added: fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-03-08 19:46:56 UTC (rev 872)
@@ -0,0 +1,23 @@
+# Fix FTBFS with Linux >= 3.2.8 on 32bit systems.
+# Closes: #663107
+
+diff -Naur fglrx-driver-12-2.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-12-2/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-12-2.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-02-29 21:34:52.000000000 +0100
++++ fglrx-driver-12-2/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-03-08 20:44:07.784539846 +0100
+@@ -5799,10 +5799,16 @@
+ #ifdef CONFIG_X86_64
+     kernel_fpu_begin();
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,8)
++	preempt_disable();
++	if (__thread_has_fpu(current))
++		__save_init_fpu(current);
++#else
+     struct thread_info *cur_task = current_thread_info();
+     preempt_disable();
+     if (cur_task->status & TS_USEDFPU)
+         __save_init_fpu(cur_task->task);
++#endif
+     else
+         clts();
+ #endif

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2012-03-07 19:38:47 UTC (rev 871)
+++ fglrx-driver/trunk/debian/patches/series	2012-03-08 19:46:56 UTC (rev 872)
@@ -1,2 +1,3 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
+04-x86-ftbfs.diff