On 11/10/2011 10:42 AM, Tomáš Janoušek wrote:
(Don't be scared by the vboxdrv messages. Those modules don't compile with
3.2-rc1, and the bug happens there as well.)
The following patch will fix the 3.2-rc1 build problem.
Index: vboxhost/vboxpci/linux/VBoxPci-linux.c
===================================================================
--- vboxhost.orig/vboxpci/linux/VBoxPci-linux.c
+++ vboxhost/vboxpci/linux/VBoxPci-linux.c
@@ -146,7 +146,11 @@ static int __init VBoxPciLinuxInit(void)
#endif
#ifdef VBOX_WITH_IOMMU
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+ if (iommu_present(&pci_bus_type))
+#else
if (iommu_found())
+#endif
printk(KERN_INFO "vboxpci: IOMMU found\n");
else
printk(KERN_INFO "vboxpci: IOMMU not found (not registered)\n");
@@ -984,9 +988,15 @@ int vboxPciOsInitVm(PVBOXRAWPCIDRVVM pT
printk(KERN_DEBUG "vboxPciOsInitVm: %p\n", pThis);
#endif
#ifdef VBOX_WITH_IOMMU
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+ if (iommu_present(&pci_bus_type))
+ {
+ pThis->pIommuDomain = iommu_domain_alloc(&pci_bus_type);
+#else
if (iommu_found())
{
pThis->pIommuDomain = iommu_domain_alloc();
+#endif
if (!pThis->pIommuDomain)
{
printk(KERN_DEBUG "cannot allocate IOMMU domain\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
