[Pkg-fglrx-devel] r1611 - in fglrx-driver/branches/15.12-jessie-backports/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2016-09-08 17:20:42 +0000 (Thu, 08 Sep 2016)
New Revision: 1611

Added:
   fglrx-driver/branches/15.12-jessie-backports/debian/patches/14-4.6.0-build.patch
Modified:
   fglrx-driver/branches/15.12-jessie-backports/debian/changelog
   fglrx-driver/branches/15.12-jessie-backports/debian/patches/series
Log:
import 15.12-2~bpo8+2 NMU

Modified: fglrx-driver/branches/15.12-jessie-backports/debian/changelog
===================================================================
--- fglrx-driver/branches/15.12-jessie-backports/debian/changelog	2016-03-23 02:14:07 UTC (rev 1610)
+++ fglrx-driver/branches/15.12-jessie-backports/debian/changelog	2016-09-08 17:20:42 UTC (rev 1611)
@@ -1,3 +1,9 @@
+fglrx-driver (1:15.12-2~bpo8+2) jessie-backports; urgency=medium
+
+  * Add trival patch for 4.6.0 build.
+
+ -- Aron Xu <aron at debian.org>  Sun, 14 Aug 2016 20:38:24 +0800
+
 fglrx-driver (1:15.12-2~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.

Added: fglrx-driver/branches/15.12-jessie-backports/debian/patches/14-4.6.0-build.patch
===================================================================
--- fglrx-driver/branches/15.12-jessie-backports/debian/patches/14-4.6.0-build.patch	                        (rev 0)
+++ fglrx-driver/branches/15.12-jessie-backports/debian/patches/14-4.6.0-build.patch	2016-09-08 17:20:42 UTC (rev 1611)
@@ -0,0 +1,31 @@
+Index: fglrx-driver-15.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+===================================================================
+--- fglrx-driver-15.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ fglrx-driver-15.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -3228,7 +3228,7 @@ int ATI_API_CALL KCL_LockUserPages(unsig
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3246,7 +3246,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPag
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3257,7 +3257,7 @@ void ATI_API_CALL KCL_UnlockUserPages(un
+     unsigned int i;
+     for (i=0; i<page_cnt; i++)
+     {
+-        page_cache_release((struct page*)page_list[i]);
++        put_page((struct page*)page_list[i]);
+     }
+ }
+ 

Modified: fglrx-driver/branches/15.12-jessie-backports/debian/patches/series
===================================================================
--- fglrx-driver/branches/15.12-jessie-backports/debian/patches/series	2016-03-23 02:14:07 UTC (rev 1610)
+++ fglrx-driver/branches/15.12-jessie-backports/debian/patches/series	2016-09-08 17:20:42 UTC (rev 1611)
@@ -5,3 +5,4 @@
 #10-4.2.0-build.copy_xregs_to_kernel.patch
 12-4.3.0-build.patch
 13-4.4.0-build.patch
+14-4.6.0-build.patch