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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-05-23 09:57:45 +0000 (Wed, 23 May 2012)
New Revision: 901

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
Log:
update 04-x86-ftbfs.diff to fix build with kernel 3.3

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-05-21 15:27:58 UTC (rev 900)
+++ fglrx-driver/trunk/debian/changelog	2012-05-23 09:57:45 UTC (rev 901)
@@ -13,6 +13,8 @@
 
   [ Andreas Beckmann ]
   * libgl1-fglrx-glx: Add dependency on libfglrx.  (Closes: #673687)
+  * Update 04-x86-ftbfs.diff with changes from Leszek Lesner (from ZevenOS) to
+    fix build with kernel 3.3.  (Closes: #670817)
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 19 May 2012 10:29:53 +0200
 

Modified: fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-05-21 15:27:58 UTC (rev 900)
+++ fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-05-23 09:57:45 UTC (rev 901)
@@ -1,13 +1,22 @@
 # Fix FTBFS with Linux >= 3.2.8 on 32bit systems.
 # Closes: #663107
+# Fix FTBFS with Linux >= 3.3 on 32bit systems.
+# Closes: #670817
 
-diff -Naur fglrx-driver-12-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-12-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-12-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-04-23 20:42:09.000000000 +0200
-+++ fglrx-driver-12-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-04-28 11:03:32.016730019 +0200
-@@ -5807,12 +5807,21 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -5807,12 +5807,30 @@
  #ifdef CONFIG_X86_64
      kernel_fpu_begin();
  #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++    struct task_struct *tsk = current;
++    preempt_disable();
++    if (tsk->thread.fpu.has_fpu)
++        __save_init_fpu(tsk);
++    else
++       clts();
++#else
 +#ifdef TS_USEDFPU
      struct thread_info *cur_task = current_thread_info();
      preempt_disable();
@@ -23,6 +32,7 @@
 +    else
 +        clts();
 +#endif
++#endif
  #endif
  }