Fixed compilation with kernel-3.2 (bug #389953)

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 83 insertions, 17 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 71fa00e7d369..f5c06ff2a19a 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.94 2011/11/06 13:16:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.95 2011/12/03 17:36:18 polynomial-c Exp $
+
+  03 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-modules-4.1.6.ebuild,
+  +files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch:
+  Fixed compilation with kernel-3.2 (bug #389953). Thanks to Fabio Rossi for
+  providing a patch.
 
   06 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-modules-4.1.4.ebuild, virtualbox-modules-4.1.6.ebuild:
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 525b27717703..0c4528c456a4 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 RMD160 6d082729b5393bab9c185cdc768488636ac9e59e SHA1 efc1fa014934afa0ea3ae692d93e1996441945a2 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3
+AUX virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch 1630 RMD160 9760d83d992ee16492589ef8ffb8d507b1b3f9a7 SHA1 e7fffb044e8b4e6f030aeb31e006ff51b5a38a99 SHA256 5918fed292d520ddc9417e70259c06265ae9b1a614393b84156a711007da498f
 DIST vbox-kernel-module-src-4.0.12.tar.bz2 901005 RMD160 6bc21432d363ec7d92a3c7b784788f3d8b2e60b9 SHA1 b431fd82d1e23cbcab52fcc2461424d896058eff SHA256 de7306958d5e807d5aed0aa401e0cbf6106f7f89c5930a7b04ceb8cd2d7ca5d1
 DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
 DIST vbox-kernel-module-src-4.1.6.tar.xz 454840 RMD160 f1166c7b2e95276a60beb4c6dbe022826bc21ff2 SHA1 7816f6773f00f28cb287eaf4eb8b31a9b3bbdd37 SHA256 557425714e5d9e1b737c963d5a4d1b67a6e60ec47c2ddf2449dbbfd786c41cdf
 EBUILD virtualbox-modules-4.0.12.ebuild 1570 RMD160 48502bec63dcabe8f9cae90651a0d08e1a2cd60e SHA1 42aa2e640f5e8772ae2ea0ccf6f7a427051572ea SHA256 56012f6439898de74457cfb429cd2f72c29c58daf67df9d833619a27d44a73de
 EBUILD virtualbox-modules-4.1.4.ebuild 1596 RMD160 393d63add8172ca384ea48cb88d4ffe7718f4f0e SHA1 9e25216dd88fc20f9c6f6b7e6f0d41d5d41627ad SHA256 afdd14e1dd4134ca385c62e864be635b7ba853d67f803e4ac660ecb2ea817e5b
-EBUILD virtualbox-modules-4.1.6.ebuild 1596 RMD160 df8e44020ba8b559f9589ef7985f98eb9bde71f5 SHA1 f7165c67183ce89d7109c26037bc6383b196f9f2 SHA256 29924453b32c60617ef366f8906dbf0765e3b7098318588d5c6228c9db9b8e7e
-MISC ChangeLog 17407 RMD160 120144ea8493ee642c286c24166db369b3657577 SHA1 0f9bb2ae6d22c6ec811a2844ff0f319620f58744 SHA256 2649034ee57cbbf3eea7ae6b9a6866dc6dd7cc5080d5cf561b805dfda0c37f0d
+EBUILD virtualbox-modules-4.1.6.ebuild 1671 RMD160 d38142c9a74b1cbacef0ac80ea20145d1a210be7 SHA1 ae41b27487356df1c6c7757affc91752130ae3dd SHA256 3ec95700a26dab2040b28ba6385decee3335a6f04ab1cfb29e3642ba70451d4b
+MISC ChangeLog 17655 RMD160 bcee059dea2a273aba0bb9369eb070b94cc664af SHA1 9ac30e51e9e3397c548144fdfe909862ad60c2f2 SHA256 f0be5e4288c19ecce6d2df641f03d34387a2fcc44c973d5e10fabc812920ecb1
 MISC metadata.xml 524 RMD160 605893cae913de8fca2a99e283854a7c195fa4e2 SHA1 a476b7fcd62a5d1a54ad1a018c4daac50bb27d0b SHA256 9ae0eab26084901b8d307d8923f5c130d310deceb09047aae884557a00f70bbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtoipAAoJEPiazRVxLXTFOl0P+wb5RmltXpRPkdCtFr6TML9J
-VU86Ofznp6ijyNzW0Pm5xMdaEmAnw+wj5cD4ahaK7WUDq29hTtqIqXnLML1WK8As
-sUJ+zz8emAR/Uiqe1EX6oXGZocX9qpOogrplOfrqDiWZe8CcvumZPsYuQfU0rnsn
-bCufINScJeFtlXjJY8z84RJhEqYIPw3iu+tKs1N8H1VlXqMIQ3DCaebBVbre73Nv
-viFwKYa/kOOfqEQz97eMA0yMJiWicVLCiv1RPTe8ad35cxiE/xfIAEk+JC7DYYwb
-tw+uPw+57aCtEGMEV0IoWZxWBHqALydER1QV4RY6PTIM6WaUaXubY0BzvY8+dM5U
-PSYhhgQGZJ8KMZPKq0OEP5Ju39Zkafzz6Qvly/A4kZwpGzjDURGigdbiNUDuSW+j
-apGYEwKsYulZ7fo9d5iyD80DYrFI52AVWJ5Z9JWqd8+mDqhgRK4tTKhs9A6rkWUZ
-GpZ5Oq7Ip/H6Q83t6VUMI36DfJoRGe7CtH74F75XUGV4+BQwnc2n4Qnq+dWd4Nic
-AhOyXh2Nhcn9P5b9OLmP69MvoJDJeF2Wps33IcwnqbEtlIf5wgmDItxc/Zpii0nF
-Q0Bjnar6RmvFwsrcGGL960YRIWEYQgjYTKnOfvSK7dGqJWKpMjJiy65MDx12xrUk
-P/+mWJxddo4mUt74ByYF
-=NePE
+iQIcBAEBCgAGBQJO2l4YAAoJEPiazRVxLXTFx3AP/06T0HIjaMw/RS2Qcj+jzddP
+CGxpvy3jApveTFvCIitHbQWi0ji2wlMiAn5G0T/aIOZAEuzFeJGMB3DcaFf2l2vk
+FBcjcYh94UzE1Exh3qXm9C/McmFkqZ3wET0NsvX01l2vdPH7EeDZUhy7HWJvSwvl
+Q3zYuOCvwn9PzeEFrmx+i/Xma2gEOKkGxn1YGk2P36Tb7Ly4K7Ul9GKEmW+mMWcB
+Khw2hAP2Nw/nKLZObVA8YCKwmjsCdgDB149nI7MyhaEiS/KM/BLOvEmn0JEsETm2
+AcC8ka1k+efuCDmRZ9xTHCeXJ+kT278Hgjyjht9KtJYMDpeCYnyjPnwNx/EcU/MA
+PsBmI4RiMkeP0MDiTaHoGyBBJ7fjVc03+n2ZG4HaUPcFbdYhPhZ432ACzsmcHi70
+D5fSA38QMCz0EDe8gmj/ciE1XFYZz1PdCiv4+r537tnd03xDeR+etFKjXPLg/ulk
+Z+8fKQzWxeVGH4RFTGRs70jAggoZk5pxuTC9KN4lLe02Gzp4JLBgzHMzsS9rgpZE
+NzqPi9xaPqkmmNhdOcRrlxLdXqVFlm+9VUabXifCO01gQ3P1QLIugG7mpsPxjb8b
+3QRY3Nrt6LPdCXInZLGVTQtLzv3S3V/HJkahqlhHpUOg8IJ8c3kj7kvGnrBjuSfD
+/Fr0n2mHgbirzr2MAM7z
+=3qdQ
 -----END PGP SIGNATURE-----
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");
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
index e0bf972fd60a..72a076337c0f 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.2 2011/11/06 13:16:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.3 2011/12/03 17:36:18 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -35,6 +35,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #389953
+	epatch "${FILESDIR}"/${PN}-4.1.6-kernel-3.2-vboxpci.patch
+
 	if kernel_is -ge 2 6 33 ; then
 		# evil patch for new kernels - header moved
 		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'