patch from ubuntu

linux3.8.patch (text/plain), 2.42 KB, created by Billy DeVincentis on 2013-03-07 03:28:48 UTC

Author: Nate Muench <[e-mail]>
Description: Fixes building against 3.8 Kernel

Index: open-vm-tools.vmci-fix/modules/linux/shared/compat_mm.h
===================================================================
--- open-vm-tools.vmci-fix.orig/modules/linux/shared/compat_mm.h	2013-02-01 13:46:58.727967311 -0600
+++ open-vm-tools.vmci-fix/modules/linux/shared/compat_mm.h	2013-02-01 13:46:58.727967311 -0600
@@ -99,8 +99,18 @@
    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
 
 
Index: open-vm-tools.vmci-fix/modules/linux/vmci/linux/driver.c
===================================================================
--- open-vm-tools.vmci-fix.orig/modules/linux/vmci/linux/driver.c	2013-02-01 13:35:18.000000000 -0600
+++ open-vm-tools.vmci-fix/modules/linux/vmci/linux/driver.c	2013-02-01 13:48:00.264564452 -0600
@@ -128,7 +128,6 @@
    .name     = VMCI_DEVICE_NAME,
    .id_table = vmci_ids,
    .probe = vmci_probe_device,
-   .remove = __devexit_p(vmci_remove_device),
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
@@ -1747,7 +1746,6 @@
  *-----------------------------------------------------------------------------
  */
 
-static int __devinit
 vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
                   const struct pci_device_id *id) // IN: matching device ID
 {
@@ -1975,7 +1973,6 @@
  *-----------------------------------------------------------------------------
  */
 
-static void __devexit
 vmci_remove_device(struct pci_dev* pdev)
 {
    struct vmci_device *dev = pci_get_drvdata(pdev);