Changeset 39224 in vbox

Timestamp:

Nov 8, 2011 9:23:51 AM (13 years ago)

Author:

vboxsync

Message:

Linux 3.2-rc1 compile fixes

Location:

trunk/src/VBox

Files:

• Additions/linux/sharedfolders/utils.c (modified) (3 diffs)
• HostDrivers/VBoxPci/linux/VBoxPci-linux.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -111 +111 @@
         /* XXX: this probably should be set to the number of entries
            in the directory plus two (. ..) */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+        set_nlink(inode, 1);
+#else
         inode->i_nlink = 1;
+#endif
     }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
@@ -120 +124 @@
         inode->i_mode |= S_IFLNK;
         inode->i_op    = &sf_lnk_iops;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+        set_nlink(inode, 1);
+# else
         inode->i_nlink = 1;
+# endif
     }
 #endif
@@ -130 +138 @@
         inode->i_op    = &sf_reg_iops;
         inode->i_fop   = &sf_reg_fops;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+        set_nlink(inode, 1);
+#else
         inode->i_nlink = 1;
+#endif
     }
 

trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c

@@ -34 +34 @@
 
 #ifdef VBOX_WITH_IOMMU
-#include <linux/dmar.h>
-#include <linux/intel-iommu.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
-# include <asm/amd_iommu.h>
-#else
-# include <linux/amd-iommu.h>
-#endif
-#endif
+# include <linux/dmar.h>
+# include <linux/intel-iommu.h>
+# include <linux/pci.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
+#  include <asm/amd_iommu.h>
+# else
+#  include <linux/amd-iommu.h>
+# endif
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+#  define IOMMU_PRESENT()      iommu_found()
+#  define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc()
+# else
+#  define IOMMU_PRESENT()      iommu_present(&pci_bus_type)
+#  define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc(&pci_bus_type)
+# endif
+#endif /* VBOX_WITH_IOMMU */
 
 
@@ -147 +155 @@
 
 #ifdef VBOX_WITH_IOMMU
-    if (iommu_found())
+    if (IOMMU_PRESENT())
         printk(KERN_INFO "vboxpci: IOMMU found\n");
     else
@@ -985 +993 @@
 #endif
 #ifdef VBOX_WITH_IOMMU
-    if (iommu_found())
-    {
-        pThis->pIommuDomain = iommu_domain_alloc();
+    if (IOMMU_PRESENT())
+    {
+        pThis->pIommuDomain = IOMMU_DOMAIN_ALLOC();
         if (!pThis->pIommuDomain)
         {