From: Vadim Kuznetsov Date: Fri, 6 Jan 2012 14:30:38 +0000 (+0000) Subject: added patch for 3.2 kernel X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd66888be5e4619e7e18535947f9e463d330ccb0;p=gentoo.git added patch for 3.2 kernel Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index 8e43c6a954ba..fe9907338397 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vmware-modules -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.84 2011/12/05 16:06:08 vadimk Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.85 2012/01/06 14:30:38 vadimk Exp $ + + 06 Jan 2012; Vadim Kuznetsov +files/264-3.2.0.patch, + vmware-modules-264.1.ebuild: + added patch for 3.2 kernel 05 Dec 2011; Vadim Kuznetsov -files/1.0.0.25-autoconf-generated.patch, diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 8201e126092b..d6d47b577d5e 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -7,18 +7,19 @@ AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d4 AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0 AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458 +AUX 264-3.2.0.patch 3100 RMD160 7ca6bf61249fd0f4fde34b621c605e9be0fe3789 SHA1 b4ecbf4d890ea55e17047102af52632db0a420bd SHA256 40ac22fc4a1cf859186e26155ff96ab2bbd26ea58be2f6bce5c2b12e0949c4bd AUX 264-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d AUX 264-makefile-include.patch 2501 RMD160 da46f1229097539c7272d421f4d50b322e4d6e28 SHA1 30b57e8033e49eaf4923a4032765950e684533fc SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 AUX 264-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 AUX 264-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 EBUILD vmware-modules-238.5.ebuild 1991 RMD160 fde27449f5ec59546fcc83592541d23d6cfe7b10 SHA1 ff401389381805741db248a3da10125c6036efd7 SHA256 74eb7f90a96ef0cd74ce8f2bef164ddb9b20f27c00131c76e3e4da3650e7d254 -EBUILD vmware-modules-264.1.ebuild 1901 RMD160 7d74f5609dcf96c0f6d800f16a35a576d5bb63ef SHA1 f6a04320ce72cb2aed7c96513f573b331b6194e5 SHA256 86b8dffb143c1beda2f5be4907adc6be970484d8c29234feb6c92849e2ea5948 -MISC ChangeLog 19117 RMD160 33dc258f00d3cb64298be44db073e5ef589f1e17 SHA1 9dccf5e32893f04c8e89d51f8052d7a374f565e3 SHA256 ca0fb594a2f97a0d52e6ee5c7818248aa25f260484c0b5d963143d9a8e7a3444 +EBUILD vmware-modules-264.1.ebuild 1947 RMD160 462c55f79892966bbef1f0c505092b9c8b579abc SHA1 d63b451316f54854188bcc71185bfeeb92761325 SHA256 8fc6e05da6208ee6652ef316e4b46e059a8e27cc7c4d87260f668bdfa77c5103 +MISC ChangeLog 19253 RMD160 986bffd617a4c256b631254839610a887d152e56 SHA1 3c46cb2e2c55446d222031b8e439e8140549d2b3 SHA256 f0e5f3d7677d89aaa303a91663aed03f554d57d87dfe45bc7877579d4f8bd2d0 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7c7AAACgkQiLKviuHfItXgaQCaA2uMWzvNofpFZTNWwo2uW5ae -CeMAn0Xosm8XP54TvyCNk9tqqbxr65NM -=7B+V +iEYEARECAAYFAk8HBZwACgkQiLKviuHfItVZdACgisAQxIxdm+sdEktFUGzD5QSe +iIsAoInteJlZhuH5Ey7kLCLj+sbbbUIB +=Rz9j -----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch new file mode 100644 index 000000000000..60a0be288765 --- /dev/null +++ b/app-emulation/vmware-modules/files/264-3.2.0.patch @@ -0,0 +1,93 @@ +diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c +index c692c2d..e8b6099 100644 +--- a/vmmon-only/linux/iommu.c ++++ b/vmmon-only/linux/iommu.c +@@ -42,6 +42,12 @@ + #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf)) + #define PCI_BDF_BUS(bdf) (((bdf) >> 8) & 0xff) + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#include ++#define iommu_found() iommu_present(&pci_bus_type) ++#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type) ++#endif ++ + typedef struct PassthruDevice { + uint32 bdf; + struct pci_dev *pdev; +diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c +index 491add5..74f7a3b 100644 +--- a/vmnet-only/filter.c ++++ b/vmnet-only/filter.c +@@ -40,6 +40,10 @@ + #include "vnetInt.h" + #include "vmnetInt.h" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#include ++#endif ++ + // VNet_FilterLogPacket.action for dropped packets + #define VNET_FILTER_ACTION_DRP (1) + #define VNET_FILTER_ACTION_DRP_SHORT (2) +diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c +index 4bdb643..540301c 100644 +--- a/vmnet-only/netif.c ++++ b/vmnet-only/netif.c +@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev); + static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); + static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); + static int VNetNetifSetMAC(struct net_device *dev, void *addr); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + static void VNetNetifSetMulticast(struct net_device *dev); ++#endif + #if 0 + static void VNetNetifTxTimeout(struct net_device *dev); + #endif +@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev) // IN: + .ndo_stop = VNetNetifClose, + .ndo_get_stats = VNetNetifGetStats, + .ndo_set_mac_address = VNetNetifSetMAC, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = VNetNetifSetMulticast, ++#endif + /* + * We cannot stuck... If someone will report problems under + * low memory conditions or some such, we should enable it. +@@ -612,11 +616,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: + *---------------------------------------------------------------------- + */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + void + VNetNetifSetMulticast(struct net_device *dev) // IN: unused + { + } +- ++#endif + + /* + *---------------------------------------------------------------------- +diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c +index 541187b..77e0089 100644 +--- a/vmnet-only/userif.c ++++ b/vmnet-only/userif.c +@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb, // IN: skb to copy + unsigned int tmpCsum; + const void *vaddr; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++ vaddr = kmap(skb_frag_page(frag)); ++#else + vaddr = kmap(frag->page); ++#endif + tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset, + curr, frag->size, 0, &err); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++ kunmap(skb_frag_page(frag)); ++#else + kunmap(frag->page); ++#endif + if (err) { + return err; + } diff --git a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild index e09b4adec72b..a35a17403423 100644 --- a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.1.ebuild,v 1.1 2011/12/03 20:04:15 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.1.ebuild,v 1.2 2012/01/06 14:30:38 vadimk Exp $ EAPI="2" @@ -63,6 +63,7 @@ src_prepare() { epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch" epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" + epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch" } src_install() {