diff options
| author | Denis Demidov | 2016-12-20 09:34:26 +0300 |
|---|---|---|
| committer | Denis Demidov | 2016-12-20 09:34:26 +0300 |
| commit | 5a47ed524a27466991d7bcc739e1d59b5a8a6f1a (patch) | |
| tree | b9c447ac9679fa1d4184350c49a62a6083439101 /4.9_over_4.6-arch-get_user_pages_remote.patch | |
| parent | aaa63f3774090a91b294b64d92eae7475da2997b (diff) | |
| parent | 3307d4c338883c1e29b4c5a92f20059ac71c26ac (diff) | |
| download | aur-5a47ed524a27466991d7bcc739e1d59b5a8a6f1a.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '4.9_over_4.6-arch-get_user_pages_remote.patch')
| -rw-r--r-- | 4.9_over_4.6-arch-get_user_pages_remote.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/4.9_over_4.6-arch-get_user_pages_remote.patch b/4.9_over_4.6-arch-get_user_pages_remote.patch new file mode 100644 index 000000000000..802ca96b6787 --- /dev/null +++ b/4.9_over_4.6-arch-get_user_pages_remote.patch @@ -0,0 +1,24 @@ +--- 16.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-12-10 19:44:46.764677311 +0100 ++++ 16.12b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-12-10 19:45:43.941354338 +0100 +@@ -3225,7 +3225,9 @@ + int ret; + + down_read(¤t->mm->mmap_sem); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ++ ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 1, (struct page **)page_list, NULL); ++#elif 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); +@@ -3247,7 +3249,9 @@ + int ret; + + down_read(¤t->mm->mmap_sem); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ++ ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 0, (struct page **)page_list, NULL); ++#elif 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); |