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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-07-09 17:45:32 +0000 (Thu, 09 Jul 2015)
New Revision: 1487

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
Log:
- Rewrite patch 05-4.0.0-build.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-07-09 17:45:03 UTC (rev 1486)
+++ fglrx-driver/trunk/debian/changelog	2015-07-09 17:45:32 UTC (rev 1487)
@@ -13,6 +13,7 @@
   [ Patrick Matthäi ]
   * New upstream release.
     - Refresh hunky patch 04-3.17rc6-no_hotplug.
+    - Rewrite patch 05-4.0.0-build.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 09 Jul 2015 14:55:04 +0200
 

Modified: fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-07-09 17:45:03 UTC (rev 1486)
+++ fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-07-09 17:45:32 UTC (rev 1487)
@@ -2,10 +2,10 @@
 # Thanks to Michael Rasmussen <mir at datanom.net>.
 # Closes: #785150
 
-diff -Naur fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-06 19:55:22.758016328 +0200
-+++ fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-06 19:55:42.101651502 +0200
-@@ -4471,8 +4471,13 @@
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-09 19:43:15.649416114 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-09 19:42:53.181892574 +0200
+@@ -4501,8 +4501,13 @@
  
      if (cpu_has_pge)
      {
@@ -19,7 +19,7 @@
      }
       __flush_tlb();
  
-@@ -4485,7 +4490,11 @@
+@@ -4515,7 +4520,11 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -32,7 +32,7 @@
      }
      local_irq_restore(flags);
  
-@@ -4512,8 +4521,13 @@
+@@ -4542,8 +4551,13 @@
  
      if (cpu_has_pge)
      {
@@ -46,7 +46,7 @@
      }
       __flush_tlb();
    
-@@ -4525,7 +4539,11 @@
+@@ -4555,7 +4569,11 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -59,35 +59,9 @@
      }
      local_irq_restore(flags);
  
-@@ -4819,8 +4837,13 @@
- {
-     unsigned long orig_level;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-     orig_level = __get_cpu_var(kasExecutionLevel);
-     __get_cpu_var(kasExecutionLevel) = level;
-+#else
-+    orig_level = __this_cpu_read(kasExecutionLevel);
-+    __this_cpu_write(kasExecutionLevel, level);
-+#endif
- 
-     return orig_level;
- }
-@@ -4832,7 +4855,11 @@
-  */
- static unsigned long kas_GetExecutionLevel(void)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-     return __get_cpu_var(kasExecutionLevel);
-+#else
-+    return __this_cpu_read(kasExecutionLevel);
-+#endif
- }
- 
- /** \brief Type definition for kas_spin_lock() parameter */
-diff -Naur fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-06-02 18:47:29.000000000 +0200
-+++ fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-06 19:55:42.105651426 +0200
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-04 16:31:23.000000000 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-09 19:42:53.181892574 +0200
 @@ -169,7 +169,7 @@
                                    const char* s2,
                                    KCL_TYPE_SizeSigned count)