diff options
author | Matt McHenry <github@matt.mchenryfamily.org> | 2016-08-30 22:28:01 -0400 |
---|---|---|
committer | Matt McHenry <github@matt.mchenryfamily.org> | 2016-09-03 21:29:52 -0400 |
commit | 7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b (patch) | |
tree | ed2dcdaefe680f6095ca51c0d62c355c0c4e7724 /pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch | |
parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
download | nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar.gz nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar.bz2 nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar.lz nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar.xz nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.tar.zst nixpkgs-7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b.zip |
patch ati-drivers for kernel 4.6
this uses the patch from https://github.com/manjaro/packages-extra/commit/ddae91f2 to account for https://github.com/torvalds/linux/commit/d4edcf0d and the patch from https://www.virtualbox.org/ticket/15298 to account for https://github.com/torvalds/linux/commit/09cbfeaf
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch')
-rw-r--r-- | pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch new file mode 100644 index 00000000000..1e7209ed5ed --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch @@ -0,0 +1,25 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 9c70211..b2242af 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3220,7 +3220,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +@@ -3238,7 +3238,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +-- +2.9.2 + |