15.9-11: 4.6 kernel support

3 files changed, 50 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66b2ab216914..bfe2b358d439 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catalyst
 	pkgdesc = AMD/ATI Catalyst drivers for linux. fglrx kernel module only. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED
 	pkgver = 15.9
-	pkgrel = 10
+	pkgrel = 11
 	url = http://www.amd.com
 	install = catalyst.install
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = catalyst
 	makedepends = make
 	makedepends = linux-headers
 	depends = linux>=3.0
-	depends = linux<4.6
+	depends = linux<4.7
 	depends = catalyst-utils
 	conflicts = catalyst-test
 	source = http://www2.ati.com/drivers/linux/amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip
@@ -27,6 +27,7 @@ pkgbase = catalyst
 	source = crimson_i686_xg.patch
 	source = 4.4-manjaro-xstate.patch
 	source = grsec_arch.patch
+	source = 4.6-arch-get_user_pages-page_cache_release.patch
 	md5sums = d2de2df6946b452c266a3c892e6e46ff
 	md5sums = fd98b7e486d7fd4cad8de7b95b5b031e
 	md5sums = 3e1b82bd69774ea808da69c983d6a43b
@@ -39,6 +40,7 @@ pkgbase = catalyst
 	md5sums = 6cdbaf5f71d867d225721a0369413616
 	md5sums = d9bea135ae3e1b3ca87c5bbe6dcf8e72
 	md5sums = 8941e91fc58cb44ce21ab9bda135754e
+	md5sums = 11b7c2e0dc4794801005d66b0e7608a3
 
 pkgname = catalyst
 
diff --git a/4.6-arch-get_user_pages-page_cache_release.patch b/4.6-arch-get_user_pages-page_cache_release.patch
new file mode 100644
index 000000000000..935392c8fc84
--- /dev/null
+++ b/4.6-arch-get_user_pages-page_cache_release.patch
@@ -0,0 +1,38 @@
+--- 16.5/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-18 19:47:41.000000000 +0100
++++ 16.5b/common/lib/modules/fglrx/build_mod/firegl_public.c	2016-05-09 20:29:48.227025117 +0200
+@@ -3220,7 +3220,11 @@
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
++    ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++#else
+     ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++#endif
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3238,7 +3242,11 @@
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
++    ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++#else
+     ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++#endif
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3249,7 +3257,11 @@
+     unsigned int i;
+     for (i=0; i<page_cnt; i++)
+     {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
++        put_page((struct page*)page_list[i]);
++#else
+         page_cache_release((struct page*)page_list[i]);
++#endif
+     }
+ }
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 6efcc26b3c40..c52078bd5bbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,19 +9,20 @@
 # Contributor: zoopp
 # Contributor: kolasa (part of 4.3 kernel patches)
 # Contributor: gentoo (part of 4.3 kernel patches)
+# Contributor: 	Philip Muller @ Manjaro (4.4 kernel patch)
 
 
 _kernver=`uname -r`
 
 pkgname=catalyst
 pkgver=15.9
-pkgrel=10
+pkgrel=11
 _amdver=15.201.1151
 pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
-depends=('linux>=3.0' 'linux<4.6' 'catalyst-utils')
+depends=('linux>=3.0' 'linux<4.7' 'catalyst-utils')
 makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers')
 conflicts=('catalyst-test')
 install=catalyst.install
@@ -41,7 +42,8 @@ source=(
     4.2-amd-from_crimson_15.11.patch
     crimson_i686_xg.patch
     4.4-manjaro-xstate.patch
-    grsec_arch.patch)
+    grsec_arch.patch
+    4.6-arch-get_user_pages-page_cache_release.patch)
 
 md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 'fd98b7e486d7fd4cad8de7b95b5b031e'
@@ -54,7 +56,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 'fd2851026228ca72124972d1ea0335ea'
 	 '6cdbaf5f71d867d225721a0369413616'
 	 'd9bea135ae3e1b3ca87c5bbe6dcf8e72'
-	 '8941e91fc58cb44ce21ab9bda135754e')
+	 '8941e91fc58cb44ce21ab9bda135754e'
+	 '11b7c2e0dc4794801005d66b0e7608a3')
 
 
 build() {
@@ -87,6 +90,7 @@ build() {
       test "${CARCH}" = "i686" && patch -Np1 -i ../crimson_i686_xg.patch
       patch -Np1 -i ../4.4-manjaro-xstate.patch
       patch -Np1 -i ../grsec_arch.patch
+      patch -Np1 -i ../4.6-arch-get_user_pages-page_cache_release.patch
 
       cd ${srcdir}/archive_files/common/lib/modules/fglrx/build_mod
       cp ${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a .