[Pkg-fglrx-devel] r873 - fglrx-driver/trunk/debian/patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-03-09 22:42:49 +0000 (Fri, 09 Mar 2012)
New Revision: 873

Modified:
   fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
Log:
Use the offical AMD patch.


Modified: fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-03-08 19:46:56 UTC (rev 872)
+++ fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-03-09 22:42:49 UTC (rev 873)
@@ -3,21 +3,26 @@
 
 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 @@
++++ fglrx-driver-12-2/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-03-09 23:37:37.994029836 +0100
+@@ -5799,12 +5799,21 @@
  #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
++#ifdef TS_USEDFPU
      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();
++#else
++    struct task_struct *cur_task = current;
++    preempt_disable();
++    if (cur_task->thread.has_fpu)
++        __save_init_fpu(cur_task);
++    else
++        clts();
++#endif
  #endif
+ }
+