diff options
Diffstat (limited to 'app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch')
-rw-r--r-- | app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch b/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch new file mode 100644 index 0000000..9012176 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch @@ -0,0 +1,68 @@ +--- ./vmci-only/linux/driver.c.old 2016-05-19 19:00:09.784669042 +0200 ++++ ./vmci-only/linux/driver.c 2016-05-19 19:00:47.480671150 +0200 +@@ -1468,7 +1468,11 @@ + int retval; + + down_read(¤t->mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ retval = get_user_pages(addr, 1, 1, 0, &page, NULL); ++#else + retval = get_user_pages(current, current->mm, addr, + 1, 1, 0, &page, NULL); ++#endif + up_read(¤t->mm->mmap_sem); + +--- ./vmci-only/linux/vmciKernelIf.c.old 2016-05-19 18:57:04.344658673 +0200 ++++ ./vmci-only/linux/vmciKernelIf.c 2016-05-19 19:03:28.600680159 +0200 +@@ -2049,6 +2049,13 @@ + int err = VMCI_SUCCESS; + + down_write(¤t->mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ retval = get_user_pages((VA)produceUVA, ++ produceQ->kernelIf->numPages, ++ 1, 0, ++ produceQ->kernelIf->u.h.headerPage, ++ NULL); ++#else + retval = get_user_pages(current, + current->mm, + (VA)produceUVA, +@@ -2056,6 +2063,7 @@ + 1, 0, + produceQ->kernelIf->u.h.headerPage, + NULL); ++#endif + if (retval < produceQ->kernelIf->numPages) { + Log("get_user_pages(produce) failed (retval=%d)\n", retval); + VMCIReleasePages(produceQ->kernelIf->u.h.headerPage, retval, FALSE); +--- ./vmmon-only/linux/hostif.c.old 2016-05-19 18:50:42.872637343 +0200 ++++ ./vmmon-only/linux/hostif.c 2016-05-19 18:53:40.208647259 +0200 +@@ -1163,7 +1163,11 @@ + int retval; + + down_read(¤t->mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, NULL); ++#else + retval = get_user_pages(current, current->mm, (unsigned long)uvAddr, + numPages, 0, 0, ppages, NULL); ++#endif + up_read(¤t->mm->mmap_sem); + +--- ./vmnet-only/userif.c.old 2016-05-19 18:52:45.904644222 +0200 ++++ ./vmnet-only/userif.c 2016-05-19 18:53:28.599646610 +0200 +@@ -113,8 +113,12 @@ + int retval; + + down_read(¤t->mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ retval = get_user_pages(addr, 1, 1, 0, &page, NULL); ++#else + retval = get_user_pages(current, current->mm, addr, +- 1, 1, 0, &page, NULL); ++ 1, 1, 0, &page, NULL); ++#endif + up_read(¤t->mm->mmap_sem); + + if (retval != 1) { |