diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linux-3.8.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linux-3.8.patch deleted file mode 100644 index bc087218d8..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linux-3.8.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- open-vm-tools-2012.05.21-724730/modules/linux/vmci/linux/driver.c~ 2012-05-22 22:12:52.000000000 +0200 -+++ open-vm-tools-2012.05.21-724730/modules/linux/vmci/linux/driver.c 2013-02-21 01:22:04.836684885 +0100 -@@ -128,7 +128,11 @@ static struct pci_driver vmci_driver = { - .name = VMCI_DEVICE_NAME, - .id_table = vmci_ids, - .probe = vmci_probe_device, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - .remove = __devexit_p(vmci_remove_device), -+#else -+ .remove = vmci_remove_device, -+#endif - }; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -@@ -1747,7 +1751,10 @@ vmci_enable_msix(struct pci_dev *pdev) / - *----------------------------------------------------------------------------- - */ - --static int __devinit -+static int -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) -+__devinit -+#endif - vmci_probe_device(struct pci_dev *pdev, // IN: vmci PCI device - const struct pci_device_id *id) // IN: matching device ID - { -@@ -1975,7 +1982,10 @@ vmci_probe_device(struct pci_dev *pdev, - *----------------------------------------------------------------------------- - */ - --static void __devexit -+static void -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) -+__devexit -+#endif - vmci_remove_device(struct pci_dev* pdev) - { - struct vmci_device *dev = pci_get_drvdata(pdev); ---- open-vm-tools-2012.05.21-724730/modules/linux/shared/compat_mm.h 2013-01-17 17:58:53.090333002 +0100 -+++ open-vm-tools-2012.05.21-724730/modules/linux/shared/compat_mm.h 2013-01-17 18:18:25.274280444 +0100 -@@ -99,8 +99,18 @@ static inline struct page * alloc_pages( - vmtruncate(inode, size); \ - result; \ - }) --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - #define compat_vmtruncate(inode, size) vmtruncate(inode, size) -+#else -+#define compat_vmtruncate(inode, size) \ -+({ \ -+ result = inode_newsize_ok(inode, size); \ -+ if (!result) \ -+ { \ -+ truncate_setsize(inode, size); \ -+ } \ -+ result; \ -+}) - #endif - - diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-kernel-3.6.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-kernel-3.9.patch similarity index 82% rename from packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-kernel-3.6.patch rename to packages/sysutils/open-vm-tools/patches/open-vm-tools-kernel-3.9.patch index 26d6dd2d9d..88bdb4832b 100644 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-kernel-3.6.patch +++ b/packages/sysutils/open-vm-tools/patches/open-vm-tools-kernel-3.9.patch @@ -1,25 +1,25 @@ diff --git a/modules/linux/vmhgfs/inode.c b/modules/linux/vmhgfs/inode.c -index 8d6cfbb..3642171 100644 +index af240d7..2994df7 100644 --- a/modules/linux/vmhgfs/inode.c +++ b/modules/linux/vmhgfs/inode.c -@@ -1852,7 +1852,7 @@ HgfsPermission(struct inode *inode, +@@ -1870,7 +1870,7 @@ HgfsPermission(struct inode *inode, #else if (mask & MAY_ACCESS) { /* For sys_access. */ #endif - struct list_head *pos; + struct hlist_node *pos; - int dcount = 0; - struct dentry *dentry = NULL; -@@ -1872,7 +1872,7 @@ HgfsPermission(struct inode *inode, + /* + * In 2.6.38 path walk is done in 2 distinct modes: rcu-walk and +@@ -1888,7 +1888,7 @@ HgfsPermission(struct inode *inode, #endif /* Find a dentry with valid d_count. Refer bug 587879. */ - list_for_each(pos, &inode->i_dentry) { + list_for_each(pos, inode->i_dentry.first) { - dentry = list_entry(pos, struct dentry, d_alias); + int dcount; + struct dentry *dentry = list_entry(pos, struct dentry, d_alias); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) - dcount = atomic_read(&dentry->d_count); diff --git a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c index d05ccad..dff7fb5 100644 --- a/modules/linux/vmsync/sync.c diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linuxdir.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch similarity index 100% rename from packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linuxdir.patch rename to packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch