diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-12-03 17:36:18 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-12-03 17:36:18 +0000 |
| commit | 3ec3960e5afc6e0be6426f843017b5c2119b15ff (patch) | |
| tree | 017c5fd63c3b27fde3af89d864ee0d435e13feae /app-emulation/virtualbox-modules/files | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #389981 (diff) | |
| download | historical-3ec3960e5afc6e0be6426f843017b5c2119b15ff.tar.gz historical-3ec3960e5afc6e0be6426f843017b5c2119b15ff.tar.bz2 historical-3ec3960e5afc6e0be6426f843017b5c2119b15ff.zip | |
Fixed compilation with kernel-3.2 (bug #389953)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/virtualbox-modules/files')
| -rw-r--r-- | app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch new file mode 100644 index 000000000000..172f0d6cd456 --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/389953 + +--- vboxpci/linux/VBoxPci-linux.c ++++ vboxpci/linux/VBoxPci-linux.c +@@ -33,14 +33,22 @@ + #include "VBoxPciInternal.h" + + #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 */ + + + /******************************************************************************* +@@ -146,7 +154,7 @@ + #endif + + #ifdef VBOX_WITH_IOMMU +- if (iommu_found()) ++ if (IOMMU_PRESENT()) + printk(KERN_INFO "vboxpci: IOMMU found\n"); + else + printk(KERN_INFO "vboxpci: IOMMU not found (not registered)\n"); +@@ -984,9 +992,9 @@ + printk(KERN_DEBUG "vboxPciOsInitVm: %p\n", pThis); + #endif + #ifdef VBOX_WITH_IOMMU +- if (iommu_found()) ++ if (IOMMU_PRESENT()) + { +- pThis->pIommuDomain = iommu_domain_alloc(); ++ pThis->pIommuDomain = IOMMU_DOMAIN_ALLOC(); + if (!pThis->pIommuDomain) + { + printk(KERN_DEBUG "cannot allocate IOMMU domain\n"); |