diff options
author | Cody P Schafer | 2017-05-30 10:29:07 -0400 |
---|---|---|
committer | Cody P Schafer | 2017-05-30 10:29:07 -0400 |
commit | e0c3e5169342638607fd8b684769295861a99008 (patch) | |
tree | 984694155a4ccde1b8692696db44351f3d6d4c43 | |
parent | e1422be4a5d29ec23485b45de76e79cd44e731ca (diff) | |
download | aur-e0c3e5169342638607fd8b684769295861a99008.tar.gz |
somehow I missed the 4.11 patch
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | 0001-fix-4.11.y.patch | 60 | ||||
-rw-r--r-- | PKGBUILD | 3 |
3 files changed, 66 insertions, 4 deletions
@@ -1,6 +1,6 @@ pkgbase = parallels-tools pkgdesc = Parallels virtualization integration services & drivers - pkgver = 11.2.2.32651 + pkgver = 11.2.2.32663 pkgrel = 4 url = https://parallels.com arch = x86_64 @@ -27,8 +27,9 @@ pkgbase = parallels-tools source = dir://parallels-tools/installer/prlfsmountd.sh source = 0001-fix-for-4.9.y.patch source = 0001-fix-4.10.y.patch - sha1sums = af32269e60b11704be9fca73ea9586da01b37ae2 - sha1sums = 604bcee0d5c9ac6a347c6ce40792ddc7598f99dd + source = 0001-fix-4.11.y.patch + sha1sums = 1bb6c8d9b1fc8ff781d89cdd3856995002670911 + sha1sums = af8932e2abd88d50c8135b9d1effa38abb3664ff sha1sums = 8d7b264653f8167904d0328e1fc540fc0b7bc7eb sha1sums = a20911495461ed1950bee069d128fe6c7103c97d sha1sums = da5fcbc6a93f1d3939752838e53d1daea13307cb diff --git a/0001-fix-4.11.y.patch b/0001-fix-4.11.y.patch new file mode 100644 index 000000000000..a2bc087efc41 --- /dev/null +++ b/0001-fix-4.11.y.patch @@ -0,0 +1,60 @@ +From 3864ee84372e03e080a2b7c830e30db47d9a4415 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer <dev@codyps.com> +Date: Thu, 25 May 2017 13:15:56 -0400 +Subject: [PATCH] fix kernel 4.11.y + +--- + prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c | 7 ++++++- + prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c | 8 ++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c +index 7e987e8..d8a364b 100644 +--- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c ++++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c +@@ -327,7 +327,9 @@ out: + #endif + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++static int prlfs_fault (struct vm_fault *vmf) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + static int prlfs_fault (struct vm_area_struct *vma, struct vm_fault *vmf) + #else + static struct page *prlfs_nopage(struct vm_area_struct *vma, +@@ -347,6 +349,9 @@ static struct page *prlfs_nopage(struct vm_area_struct *vma, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + int retval; + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++ struct vm_area_struct *vma = vmf->vma; ++#endif + + DPRINTK("ENTER\n"); + if (!vma->vm_file) { +diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +index 7cb3f3e..d1426d8 100644 +--- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ++++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +@@ -531,9 +531,17 @@ struct dentry_operations prlfs_dentry_ops = { + }; + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++static int prlfs_getattr(const struct path *p, struct kstat *stat, ++ u32 request_mask, unsigned int flags) ++#else + static int prlfs_getattr(struct vfsmount *mnt, struct dentry *dentry, + struct kstat *stat) ++#endif + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++ struct dentry *dentry = p->dentry; ++#endif + int ret; + DPRINTK("ENTER\n"); + if (check_dentry(dentry)) { +-- +2.13.0 + @@ -2,7 +2,7 @@ pkgbase=parallels-tools pkgname=(parallels-tools parallels-tools-dkms) pkgver=11.2.2.32663 -pkgrel=4 +pkgrel=5 pkgdesc="Parallels virtualization integration services & drivers" arch=('x86_64') url="https://parallels.com" @@ -34,6 +34,7 @@ source=( dir://parallels-tools/installer/prlfsmountd.sh '0001-fix-for-4.9.y.patch' '0001-fix-4.10.y.patch' + '0001-fix-4.11.y.patch' ) sha1sums=('1bb6c8d9b1fc8ff781d89cdd3856995002670911' |