[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2012-03-26 19:48 Vadim Kuznetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Vadim Kuznetsov @ 2012-03-26 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b8cd1aeece72954fe1753b2bb078755b84ab40e3
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 19:47:54 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:47:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b8cd1aee

added apic patch. bug 404089.
	modified:   Manifest
	new file:   files/264-apic.patch
	deleted:    files/apic.patch
	modified:   vmware-modules-264.2-r1.ebuild

---
 app-emulation/vmware-modules/Manifest              |   26 --------------------
 app-emulation/vmware-modules/files/264-apic.patch  |   12 +++++++++
 app-emulation/vmware-modules/files/apic.patch      |   12 ---------
 .../vmware-modules/vmware-modules-264.2-r1.ebuild  |    1 +
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index ba62c16..349c432 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,28 +1,2 @@
-AUX 208-sema.patch 2963 RMD160 95c017d5bb061cd548b9db6552ed548e323286c6 SHA1 8808f4796fa5c79757fbca1612c06d9fa020b5ba SHA256 ab3c79d677f5169f5c575498fb467d94f6fb1455f9a7218b34c21bddaa4704e7
-AUX 208-sk_sleep.patch 2968 RMD160 c3ef68d37bfcd877f3de0f8e9dea849e18804435 SHA1 0c52cf788c707e47fdf8ff0925c69fdca5c10155 SHA256 00ca100a8b4da48e26b663c4302a4b8f8d561c084e0bd5cee27a5874e03115f6
-AUX 208-unlocked_ioctl.patch 1136 RMD160 129bf2d0d6d4580b5c25f116d9108f4dc51e08cf SHA1 570eb32de37822c8c2b06f1075306fec3df1d257 SHA256 51f9cf2eb91fd25f784ef611ef3fd1f611bb5627a32e9e9fc5c48e3b0e9aef15
-AUX 238-2.6.39.patch 8566 RMD160 1fb07e92cebba852da61b36ee10dcdb4e12d5729 SHA1 6098b91349ab7bc128fea3df27671423f5ddcd1a SHA256 31e68e9897660cc8ff898eae1d722d616205fff1efd30cd8e042a3a455bd2350
-AUX 238-3.2.0.patch 3533 RMD160 e7928a853397dd5f01b46022e2abdd24c440c4b1 SHA1 bb91934f89cabb305ad9df6d6f5df3fa4f32f900 SHA256 df2bf5a026281559ba6e0d364555c8f48024b7ce2231c652960b5c477cc4545a
-AUX 238-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
-AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
-AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
-AUX 238-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751
-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 3527 RMD160 1bb5eaebbf8cc17bd9dd4f2cd87554e52bb1f714 SHA1 0d80f90ef11fc07064963c4ec90a136a8b40189a SHA256 5c4e679b9667a353c4b19ad17ec086386314a56c1890e87a44fc6da16c655029
-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
-AUX 264.2-3.2.0.patch 2949 RMD160 e343db72eeb80e43ab5fbd5b4c2efebcb81c2c5e SHA1 bf88b0be9fcdc9705de846452d44833e0b146c11 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0
-AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c
-AUX hardened.patch 5052 RMD160 818caeb51a5fa7aae556e465beadc0ff684b54a7 SHA1 8a5feac39756fd476c087af247e853b0321a4823 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6
-AUX iommu_map.patch 1630 RMD160 b403a19350d3a73e6ecf74159763b31d6d20b630 SHA1 d021dbbdb59273048806c09b8f59bd97a8883017 SHA256 6253ba1c6bd211d68e79ce9e811cdcc60ebc022a7787874922db552b32ef2b09
-AUX sk_sleep.patch 6937 RMD160 e15642e34906138278563d57e9647e4e579d437e SHA1 ce9a3e9069bb85cb9793c59d38ad4f217ba8d5b2 SHA256 67a019290204b36410996ecd1bbe4e630b2022970ddb236a120abf1b810f05b4
 DIST vmware-modules-138.10-genpatches-7.tar.bz2 14498 RMD160 a6927bad3eb2b797eb5d8d2a90c6447ebb1fd709 SHA1 57a1524149f976bccfbc0789cd40863f1ab012f0 SHA256 2b3209e71543904eb39919b3da19df4b1c702b00e5f2def9c9d53b3ca9b7e2b6
 DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b2907f0e2b11 SHA1 4fece02cd13f8bafdc62562d2f8e2a4cc66c75a1 SHA256 7b1d16163626b2ea2c1bba82a537368e2f758356580044480994b1fbe0073b47
-EBUILD vmware-modules-138.10.7.ebuild 1825 RMD160 3e4999c91f97217815c9d8ad852a63f0d452995d SHA1 c2bd1e62e0418f62b5f62261811734ba9e8f34b2 SHA256 573f1080031bf394cde783ef5d574da7934546d586e3dc942037fde0b1d2e6be
-EBUILD vmware-modules-208.2.ebuild 1861 RMD160 6641f57a7906ff1eb243e14561c37475eda6d910 SHA1 aab9187681ca6b88b4178b98d259116130c39037 SHA256 140d78cc98da4cd19a24d593bec01417793592212273d632adfc465fe80ff311
-EBUILD vmware-modules-238.5.ebuild 2087 RMD160 4ce59dbfcd91b1c7fb7890db44598b712bd4a167 SHA1 81b125573edfa561de02b9f8c4dd4dd96a44002b SHA256 25544d4c0c21e3ccd72f6730a9336487e5020c743bfa400c01d5c0623a504f2f
-EBUILD vmware-modules-264.2.ebuild 2002 RMD160 f22df59a56b628866e97c25aa0cb86f4bbba66f4 SHA1 9b58cb8c562c762b44f5bb2b2dce58234f173d38 SHA256 3b29b808d758ea9e452104695652b8a2526dd1f3aecbf005d247b617cb768c50
-MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215

diff --git a/app-emulation/vmware-modules/files/264-apic.patch b/app-emulation/vmware-modules/files/264-apic.patch
new file mode 100644
index 0000000..66cd459
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
+ 
++#include <asm/apic.h>
+ 
+ #include "vmware.h"
+ #include "x86apic.h"

diff --git a/app-emulation/vmware-modules/files/apic.patch b/app-emulation/vmware-modules/files/apic.patch
deleted file mode 100644
index 107da28..0000000
--- a/app-emulation/vmware-modules/files/apic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vmmon-only/linux/hostif.c.orig	2009-11-16 13:24:00.000000000 +0200
-+++ vmmon-only/linux/hostif.c	2009-11-16 13:08:56.000000000 +0200
-@@ -78,6 +78,8 @@
- #include "vmmonInt.h"
- #include "versioned_atomic.h"
- 
-+#include <asm/apic.h>
-+
- #define UPTIME_FREQ CONST64(1000000)
- 
- static struct {
-

diff --git a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
index ceff913..33cd7d5 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	epatch "${FILESDIR}/${PV}-3.2.0.patch"
 	use hardened && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 }
 
 src_install() {



^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2012-05-22 13:29 Vadim Kuznetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Vadim Kuznetsov @ 2012-05-22 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f366d6993fa2b058d6a15d3ccdaed45de7b70639
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 13:28:42 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Tue May 22 13:28:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=f366d699

d_make_root patch for 3.4 kernel. Bug 411853.
	new file:   app-emulation/vmware-modules/files/264-d-make-root.patch
	modified:   app-emulation/vmware-modules/vmware-modules-264.3.ebuild

---
 .../vmware-modules/files/264-d-make-root.patch     |   16 ++++++++++++++++
 .../vmware-modules/vmware-modules-264.3.ebuild     |    1 +
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/app-emulation/vmware-modules/files/264-d-make-root.patch b/app-emulation/vmware-modules/files/264-d-make-root.patch
new file mode 100644
index 0000000..a02e4ce
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-d-make-root.patch
@@ -0,0 +1,16 @@
+diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
+index b7c535e..a36a01e 100644
+--- a/vmblock-only/linux/filesystem.c
++++ b/vmblock-only/linux/filesystem.c
+@@ -525,7 +525,11 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+    rootDentry = d_alloc_root(rootInode);
++#else
++   rootDentry = d_make_root(rootInode);
++#endif
+    if (!rootDentry) {
+       iput(rootInode);
+       return -ENOMEM;

diff --git a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index afef047..763796d 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
 }
 
 src_install() {



^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2012-05-24 17:32 Vadim Kuznetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Vadim Kuznetsov @ 2012-05-24 17:32 UTC (permalink / raw
  To: gentoo-commits

commit:     901aff71742e0d2d141d254238bf753e448a9ed6
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 17:32:02 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Thu May 24 17:32:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=901aff71

Andrew Dean's patch of 238 vmware modules for 3.4.0 kernel
	new file:   files/238-d-make-root.patch
	modified:   vmware-modules-238.5-r1.ebuild

---
 .../vmware-modules/files/238-d-make-root.patch     |   14 ++++++++++++++
 .../vmware-modules/vmware-modules-238.5-r1.ebuild  |    1 +
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/app-emulation/vmware-modules/files/238-d-make-root.patch b/app-emulation/vmware-modules/files/238-d-make-root.patch
new file mode 100644
index 0000000..7e83a1e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-d-make-root.patch
@@ -0,0 +1,14 @@
+--- a/vmblock-only/linux/filesystem.c	2012-05-23 20:08:00.632051396 -0500
++++ b/vmblock-only/linux/filesystem.c	2012-05-23 20:17:00.896297163 -0500
+@@ -517,7 +517,11 @@
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+    rootDentry = d_alloc_root(rootInode);
++#else
++   rootDentry = d_make_root(rootInode);
++#endif
+    if (!rootDentry) {
+       iput(rootInode);
+       return -ENOMEM;

diff --git a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
index 2f8a6d7..fdfcc9d 100644
--- a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
@@ -66,6 +66,7 @@ src_prepare() {
 	kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
 }
 
 src_install() {



^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2012-11-17 11:58 Vadim Kuznetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Vadim Kuznetsov @ 2012-11-17 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d08ee17a821692c9ccaebe49a66e0d6e3a7d6065
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 12:02:12 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 12:02:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=d08ee17a

kernel dir patch
	new file:   vmware-modules/files/271-makefile-kernel-dir.patch
	modified:   vmware-modules/vmware-modules-271.0.ebuild
	modified:   vmware-modules/vmware-modules-271.1.ebuild

---
 .../files/271-makefile-kernel-dir.patch            |   85 ++++++++++++++++++++
 .../vmware-modules/vmware-modules-271.0.ebuild     |    2 +-
 .../vmware-modules/vmware-modules-271.1.ebuild     |    3 +-
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch
new file mode 100644
index 0000000..1a647a3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch
@@ -0,0 +1,85 @@
+diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
+index 2b81323..746c8b8 100644
+--- a/vmblock-only/Makefile
++++ b/vmblock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmblock
+ PRODUCT := ws
+diff --git a/vmci-only/Makefile b/vmci-only/Makefile
+index 8e9c5be..6ec828b 100644
+--- a/vmci-only/Makefile
++++ b/vmci-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmci
+ PRODUCT := ws
+diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
+index 5bd867b..91a83d4 100644
+--- a/vmmon-only/Makefile
++++ b/vmmon-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmmon
+ PRODUCT := @@PRODUCT@@
+diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
+index d4eb73c..c7c6d38 100644
+--- a/vmnet-only/Makefile
++++ b/vmnet-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmnet
+ PRODUCT := @@PRODUCT@@
+diff --git a/vsock-only/Makefile b/vsock-only/Makefile
+index 93dd61d..9765696 100644
+--- a/vsock-only/Makefile
++++ b/vsock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vsock
+ PRODUCT := ws

diff --git a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
index 657723d..abcdc18 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
@@ -59,7 +59,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-vmmon.patch"

diff --git a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
index c65accb..ae88b23 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
@@ -59,10 +59,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	#epatch "${FILESDIR}/${PV_MAJOR}-vmmon.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2012-12-16 13:27 Vadim Kuznetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Vadim Kuznetsov @ 2012-12-16 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     030615f3282f9ebad5f400bc7eed57325dc0265a
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 13:25:22 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 13:25:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=030615f3

Bug 447154.
	new file:   files/271-putname.patch
	renamed:    vmware-modules-271.1.ebuild -> vmware-modules-271.1-r1.ebuild

---
 .../vmware-modules/files/271-putname.patch         |   13 +++++++++++++
 ...271.1.ebuild => vmware-modules-271.1-r1.ebuild} |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-putname.patch b/app-emulation/vmware-modules/files/271-putname.patch
new file mode 100644
index 0000000..6e76130
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-putname.patch
@@ -0,0 +1,13 @@
+diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/vmblock-only/linux/control.c
++++ b/vmblock-only/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
++   __putname(name);
+ 
+    return retval;
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
similarity index 96%
rename from app-emulation/vmware-modules/vmware-modules-271.1.ebuild
rename to app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
index ae88b23..3cc601c 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
@@ -64,6 +64,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2013-06-23 13:14 Andreas Hüttel
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Hüttel @ 2013-06-23 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     01c6195e9e984d8c9c29b3a959c3bb769ae0f472
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 13:15:49 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 13:15:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=01c6195e

Dropped vmware-modules, identical to main tree

---
 app-emulation/vmware-modules/files/208-sema.patch  |  92 --------
 .../vmware-modules/files/208-sk_sleep.patch        |  74 -------
 .../vmware-modules/files/208-unlocked_ioctl.patch  |  33 ---
 .../vmware-modules/files/238-2.6.39.patch          | 243 ---------------------
 app-emulation/vmware-modules/files/238-3.2.0.patch | 103 ---------
 .../vmware-modules/files/238-d-make-root.patch     |  14 --
 .../vmware-modules/files/238-jobserver.patch       |  75 -------
 .../files/238-makefile-include.patch               |  65 ------
 .../files/238-makefile-kernel-dir.patch            |  80 -------
 .../vmware-modules/files/238-netdevice.patch       |  24 --
 app-emulation/vmware-modules/files/238-sema.patch  |  83 -------
 .../vmware-modules/files/238-unlocked_ioctl.patch  |  33 ---
 app-emulation/vmware-modules/files/264-3.2.0.patch |  86 --------
 app-emulation/vmware-modules/files/264-apic.patch  |  12 -
 .../vmware-modules/files/264-d-make-root.patch     |  16 --
 .../vmware-modules/files/264-jobserver.patch       |  75 -------
 .../files/264-makefile-include.patch               |  65 ------
 .../files/264-makefile-kernel-dir.patch            |  80 -------
 .../vmware-modules/files/264-netdevice.patch       |  24 --
 .../vmware-modules/files/264-putname.patch         |  13 --
 app-emulation/vmware-modules/files/271-apic.patch  |  12 -
 .../files/271-makefile-include.patch               |  65 ------
 .../files/271-makefile-kernel-dir.patch            |  85 -------
 .../vmware-modules/files/271-netdevice.patch       |  24 --
 .../vmware-modules/files/271-putname.patch         |  13 --
 app-emulation/vmware-modules/files/271-vmmon.patch |  44 ----
 app-emulation/vmware-modules/files/hardened.patch  | 170 --------------
 app-emulation/vmware-modules/files/iommu_map.patch |  41 ----
 app-emulation/vmware-modules/files/sk_sleep.patch  | 242 --------------------
 app-emulation/vmware-modules/metadata.xml          |   8 -
 .../vmware-modules/vmware-modules-238.6.ebuild     |  84 -------
 .../vmware-modules/vmware-modules-264.5.ebuild     |  83 -------
 .../vmware-modules/vmware-modules-271.2.ebuild     |  82 -------
 33 files changed, 2243 deletions(-)

diff --git a/app-emulation/vmware-modules/files/208-sema.patch b/app-emulation/vmware-modules/files/208-sema.patch
deleted file mode 100644
index cbfbe9a..0000000
--- a/app-emulation/vmware-modules/files/208-sema.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/vmci-only/include/compat_semaphore.h b/vmci-only/include/compat_semaphore.h
-index f5527b9..bc37afd 100644
---- a/vmci-only/include/compat_semaphore.h
-+++ b/vmci-only/include/compat_semaphore.h
-@@ -45,5 +45,13 @@
-    #endif
- #endif
- 
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+   #ifndef DECLARE_MUTEX
-+      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-+   #endif
-+   #ifndef init_MUTEX
-+      #define init_MUTEX(_m) sema_init(_m,1)
-+   #endif
-+#endif
- 
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmmon-only/include/compat_semaphore.h b/vmmon-only/include/compat_semaphore.h
-index f5527b9..bc37afd 100644
---- a/vmmon-only/include/compat_semaphore.h
-+++ b/vmmon-only/include/compat_semaphore.h
-@@ -45,5 +45,13 @@
-    #endif
- #endif
- 
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+   #ifndef DECLARE_MUTEX
-+      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-+   #endif
-+   #ifndef init_MUTEX
-+      #define init_MUTEX(_m) sema_init(_m,1)
-+   #endif
-+#endif
- 
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmnet-only/compat_semaphore.h b/vmnet-only/compat_semaphore.h
-index f5527b9..548782d 100644
---- a/vmnet-only/compat_semaphore.h
-+++ b/vmnet-only/compat_semaphore.h
-@@ -45,5 +45,14 @@
-    #endif
- #endif
- 
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+   #ifndef DECLARE_MUTEX
-+      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-+   #endif
-+   #ifndef init_MUTEX
-+      #define init_MUTEX(_m) sema_init(_m,1)
-+   #endif
-+#endif
-+
- 
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmnet-only/vnetFilter.h b/vmnet-only/vnetFilter.h
-index fe5c71f..303009f 100644
---- a/vmnet-only/vnetFilter.h
-+++ b/vmnet-only/vnetFilter.h
-@@ -203,5 +203,13 @@ struct VNet_SetLogLevel {
- } 
- #include "vmware_pack_end.h"
- VNet_SetLogLevel;
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+   #ifndef DECLARE_MUTEX
-+      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-+   #endif
-+   #ifndef init_MUTEX
-+      #define init_MUTEX(_m) sema_init(_m,1)
-+   #endif
-+#endif
- 
- #endif // ifndef _VNETFILTER_H_
-diff --git a/vsock-only/linux/af_vsock.h b/vsock-only/linux/af_vsock.h
-index 3a8a0ce..d36b2ae 100644
---- a/vsock-only/linux/af_vsock.h
-+++ b/vsock-only/linux/af_vsock.h
-@@ -88,4 +88,14 @@ typedef struct VSockVmciSock {
- #endif
- } VSockVmciSock;
- 
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+   #ifndef DECLARE_MUTEX
-+      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-+   #endif
-+   #ifndef init_MUTEX
-+      #define init_MUTEX(_m) sema_init(_m,1)
-+   #endif
-+#endif
-+
-+
- #endif /* __AF_VSOCK_H__ */

diff --git a/app-emulation/vmware-modules/files/208-sk_sleep.patch b/app-emulation/vmware-modules/files/208-sk_sleep.patch
deleted file mode 100644
index d92dd7c..0000000
--- a/app-emulation/vmware-modules/files/208-sk_sleep.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
-index 314e5fb..bd69539 100644
---- a/vsock-only/linux/af_vsock.c
-+++ b/vsock-only/linux/af_vsock.c
-@@ -3150,5 +3150,5 @@ VSockVmciStreamConnect(struct socket *sock,   // IN
-     */
-    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
-@@ -3173,5 +3173,5 @@ VSockVmciStreamConnect(struct socket *sock,   // IN
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-@@ -3185,5 +3185,5 @@ VSockVmciStreamConnect(struct socket *sock,   // IN
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-@@ -3392,5 +3392,5 @@ VSockVmciPoll(struct file *file,    // IN
-    sk = sock->sk;
- 
--   poll_wait(file, sk->compat_sk_sleep, wait);
-+   poll_wait(file, compat_sk_sleep(sk), wait);
-    mask = 0;
- 
-@@ -3993,5 +3993,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
-     */
-    timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (totalWritten < len) {
-@@ -4032,5 +4032,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
-          }
- 
--         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
-+         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
-                                      &wait, TASK_INTERRUPTIBLE);
-       }
-@@ -4115,5 +4115,5 @@ outWait:
-       err = totalWritten;
-    }
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-@@ -4338,5 +4338,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
-    copied = 0;
- 
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while ((ready = VMCIQueue_BufReady(vsk->consumeQ,
-@@ -4381,5 +4381,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-@@ -4473,5 +4473,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);

diff --git a/app-emulation/vmware-modules/files/208-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/208-unlocked_ioctl.patch
deleted file mode 100644
index 62ae5e8..0000000
--- a/app-emulation/vmware-modules/files/208-unlocked_ioctl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index bf93446..022e856 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -169,6 +169,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #endif
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 8104878..02bb71c 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -3411,7 +3411,7 @@ HostIFDoIoctl(struct file *filp,
-    if (filp->f_op->unlocked_ioctl) {
-       return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
-    }
--#endif
-+#else
-    if (filp->f_op->ioctl) {
-       long err;
- 
-@@ -3420,6 +3420,7 @@ HostIFDoIoctl(struct file *filp,
-       unlock_kernel();
-       return err;
-    }
-+#endif
-    return -ENOIOCTLCMD;
- }
- 

diff --git a/app-emulation/vmware-modules/files/238-2.6.39.patch b/app-emulation/vmware-modules/files/238-2.6.39.patch
deleted file mode 100644
index 88873e5..0000000
--- a/app-emulation/vmware-modules/files/238-2.6.39.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff --git a/vmblock-only/linux/dentry.c b/vmblock-only/linux/dentry.c
-index 66537c8..05ea95a 100644
---- a/vmblock-only/linux/dentry.c
-+++ b/vmblock-only/linux/dentry.c
-@@ -104,7 +104,7 @@ DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
-       return actualDentry->d_op->d_revalidate(actualDentry, nd);
-    }
- 
--   if (path_lookup(iinfo->name, 0, &actualNd)) {
-+   if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
-       LOG(4, "DentryOpRevalidate: [%s] no longer exists\n", iinfo->name);
-       return 0;
-    }
-diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
-index 53840fd..bc117c5 100644
---- a/vmblock-only/linux/filesystem.c
-+++ b/vmblock-only/linux/filesystem.c
-@@ -66,7 +66,6 @@ static size_t fsRootLen;
- static struct file_system_type fsType = {
-    .owner = THIS_MODULE,
-    .name = VMBLOCK_FS_NAME,
--   .get_sb = FsOpGetSb,
-    .kill_sb = kill_anon_super,
- };
- 
-@@ -553,7 +552,7 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
-  *-----------------------------------------------------------------------------
-  */
- 
--static int
-+/*static int
- FsOpGetSb(struct file_system_type *fs_type, // IN: file system type of mount
-           int flags,                        // IN: mount flags
-           const char *dev_name,             // IN: device mounting on
-@@ -561,7 +560,7 @@ FsOpGetSb(struct file_system_type *fs_type, // IN: file system type of mount
-           struct vfsmount *mnt)             // IN: vfs mount
- {
-    return get_sb_nodev(fs_type, flags, rawData, FsOpReadSuper, mnt);
--}
-+}*/
- #else
- /*
-  *-----------------------------------------------------------------------------
-diff --git a/vmblock-only/shared/compat_namei.h b/vmblock-only/shared/compat_namei.h
-index 28d72c8..4214247 100644
---- a/vmblock-only/shared/compat_namei.h
-+++ b/vmblock-only/shared/compat_namei.h
-@@ -40,8 +40,11 @@
- #define compat_path_release(nd) path_release(nd)
- #endif
- 
-+/* path_lookup was removed in 2.6.39 merge window VFS merge */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
-+#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
- /* path_lookup was exported in 2.4.25 */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
- #define compat_path_lookup(path, flags, nd)     path_lookup(path, flags, nd)
- #else
- #define compat_path_lookup(path, flags, nd)     \
-diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
-index a0f5498..49795e1 100644
---- a/vmci-only/linux/driver.c
-+++ b/vmci-only/linux/driver.c
-@@ -42,7 +42,6 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include "compat_file.h"
- #include "compat_highmem.h"
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index a33c983..89f8827 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -781,7 +781,7 @@ LinuxDriver_Close(struct inode *inode, // IN
- 
- 
- #define POLLQUEUE_MAX_TASK 1000
--static spinlock_t pollQueueLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(pollQueueLock);
- static void *pollQueue[POLLQUEUE_MAX_TASK];
- static unsigned int pollQueueCount = 0;
- 
-@@ -1042,7 +1042,8 @@ LinuxDriverPoll(struct file *filp,
- 		* but unfortunately there is no way how to detect that
- 		* we are building for RedHat's kernel...
- 		*/
--	       static spinlock_t timerLock = SPIN_LOCK_UNLOCKED;
-+
-+	       static DEFINE_SPINLOCK(timerLock);
- 
- 	       spin_lock(&timerLock);
- 	       mod_timer(&linuxState.pollTimer, jiffies + 1);
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 6c7b34d..fabb44d 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -46,7 +46,6 @@
- #include <linux/mman.h>
- 
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include <asm/io.h>
- #include <linux/mc146818rtc.h>
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index f64e80a..b0ee013 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -44,7 +44,7 @@ typedef struct PassthruDevice {
- 
- 
- static LIST_HEAD(passthruDeviceList);
--static spinlock_t passthruDeviceListLock = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(passthruDeviceListLock);
- static void *pciHolePage = NULL;
- 
- /*
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index c91a1dc..4c195e1 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -28,7 +28,6 @@
- #include <linux/poll.h>
- 
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -105,7 +104,7 @@ const uint8 broadcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-  * not have vnetStructureMutex already acquired,
-  * it is most certainly a bug.
-  */
--static rwlock_t vnetPeerLock = RW_LOCK_UNLOCKED;
-+static DEFINE_RWLOCK(vnetPeerLock);
- 
- /*
-  * All concurrent changes to the network structure are
-@@ -115,6 +114,7 @@ static rwlock_t vnetPeerLock = RW_LOCK_UNLOCKED;
-  * vnetStructureMutex and vnetPeerLock for write.
-  */
- compat_define_mutex(vnetStructureMutex);
-+compat_define_mutex(vnetMutex);
- 
- #if defined(VM_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- /*
-@@ -264,11 +264,11 @@ LinuxDriver_Ioctl32_Handler(unsigned int fd,     // IN: (unused)
- 			    struct file * filp)  // IN:
- {
-    int ret = -ENOTTY;
--   lock_kernel();
-+   compat_mutex_lock(&vnetMutex);
-    if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) {
-       ret = VNetFileOpIoctl(filp->f_dentry->d_inode, filp, iocmd, ioarg);
-    }
--   unlock_kernel();
-+   compat_mutex_unlock(&vnetMutex);
-    return ret;
- }
- 
-@@ -1134,9 +1134,9 @@ VNetFileOpUnlockedIoctl(struct file    *filp,  // IN:
-    if (filp && filp->f_dentry) {
-       inode = filp->f_dentry->d_inode;
-    }
--   lock_kernel();
-+   compat_mutex_lock(&vnetMutex);
-    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
--   unlock_kernel();
-+   compat_mutex_unlock(&vnetMutex);
-    return err;
- }
- #endif
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index 34b7d3d..b0017d7 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -85,7 +85,7 @@ static compat_define_mutex(filterIoctlMutex); /* serialize ioctl()s from user sp
-  * callbacks can be concurrently executing on multiple threads on multiple
-  * CPUs, so we should revisit locking for allowing for that in the future.
-  */
--spinlock_t activeRuleLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(activeRuleLock);
- 
- /*
-  * Logging.
-diff --git a/vmnet-only/hub.c b/vmnet-only/hub.c
-index b05efea..38d9aef 100644
---- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -81,7 +81,7 @@ static VNetHub *vnetHub = NULL;
-  * so we use __attribute__((unused)) to quiet the compiler.
-  */
- 
--static spinlock_t vnetHubLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(vnetHubLock);
- 
- 
- /*
-diff --git a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
-index ecd057e..d565ec0 100644
---- a/vsock-only/linux/af_vsock.c
-+++ b/vsock-only/linux/af_vsock.c
-@@ -102,7 +102,6 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- #include <asm/io.h>
- #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
- #   if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-diff --git a/vsock-only/linux/util.c b/vsock-only/linux/util.c
-index 53f2edb..32a7da7 100644
---- a/vsock-only/linux/util.c
-+++ b/vsock-only/linux/util.c
-@@ -34,7 +34,7 @@
- struct list_head vsockBindTable[VSOCK_HASH_SIZE + 1];
- struct list_head vsockConnectedTable[VSOCK_HASH_SIZE];
- 
--spinlock_t vsockTableLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(vsockTableLock);
- 
- /*
-  * snprintf() wasn't exported until 2.4.10: fall back on sprintf in those
-diff --git a/vsock-only/shared/compat_namei.h b/vsock-only/shared/compat_namei.h
-index 28d72c8..4214247 100644
---- a/vsock-only/shared/compat_namei.h
-+++ b/vsock-only/shared/compat_namei.h
-@@ -40,8 +40,11 @@
- #define compat_path_release(nd) path_release(nd)
- #endif
- 
-+/* path_lookup was removed in 2.6.39 merge window VFS merge */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
-+#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
- /* path_lookup was exported in 2.4.25 */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
- #define compat_path_lookup(path, flags, nd)     path_lookup(path, flags, nd)
- #else
- #define compat_path_lookup(path, flags, nd)     \

diff --git a/app-emulation/vmware-modules/files/238-3.2.0.patch b/app-emulation/vmware-modules/files/238-3.2.0.patch
deleted file mode 100644
index 0416214..0000000
--- a/app-emulation/vmware-modules/files/238-3.2.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index b0ee013..f0f5c9a 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -36,6 +36,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 <linux/pci.h>
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
-    struct pci_dev *pdev;
-    VMLinux *vmLinux;
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index b0017d7..6c0687f 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -41,6 +41,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/export.h>
-+#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 b3c752b..79d4896 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.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-    dev->stop = VNetNetifClose;
-    dev->get_stats = VNetNetifGetStats;
-    dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-    dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
-    /*
-     * We cannot stuck... If someone will report problems under
-     * low memory conditions or some such, we should enable it.
-@@ -621,11 +627,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 4e65c76..fd12aa9 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -572,10 +572,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/files/238-d-make-root.patch b/app-emulation/vmware-modules/files/238-d-make-root.patch
deleted file mode 100644
index 7e83a1e..0000000
--- a/app-emulation/vmware-modules/files/238-d-make-root.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/vmblock-only/linux/filesystem.c	2012-05-23 20:08:00.632051396 -0500
-+++ b/vmblock-only/linux/filesystem.c	2012-05-23 20:17:00.896297163 -0500
-@@ -517,7 +517,11 @@
-       return -EINVAL;
-    }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
-    rootDentry = d_alloc_root(rootInode);
-+#else
-+   rootDentry = d_make_root(rootInode);
-+#endif
-    if (!rootDentry) {
-       iput(rootInode);
-       return -ENOMEM;

diff --git a/app-emulation/vmware-modules/files/238-jobserver.patch b/app-emulation/vmware-modules/files/238-jobserver.patch
deleted file mode 100644
index 59a6ccc..0000000
--- a/app-emulation/vmware-modules/files/238-jobserver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
---- a/work/vmblock-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmblock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
---- a/work/vmci-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmci-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
---- a/work/vmmon-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmmon-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
---- a/work/vmnet-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vmnet-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
---- a/work/vsock-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vsock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 

diff --git a/app-emulation/vmware-modules/files/238-makefile-include.patch b/app-emulation/vmware-modules/files/238-makefile-include.patch
deleted file mode 100644
index 777a3fd..0000000
--- a/app-emulation/vmware-modules/files/238-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel
-index 9d7c5ca..92cefff 100644
---- a/work/vmblock-only/Makefile.kernel
-+++ b/work/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
-diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel
-index 22dc232..67e709f 100644
---- a/work/vmci-only/Makefile.kernel
-+++ b/work/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
- 
-diff --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel
-index a7e26ea..befaca7 100644
---- a/work/vmmon-only/Makefile.kernel
-+++ b/work/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c,   -DVMW_SKAS_MMAP, )
-diff --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel
-index 4b16d06..0e252a6 100644
---- a/work/vmnet-only/Makefile.kernel
-+++ b/work/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
-diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel
-index 47ef5f3..b3539ef 100644
---- a/work/vsock-only/Makefile.kernel
-+++ b/work/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- 

diff --git a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d1..0000000
--- a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws

diff --git a/app-emulation/vmware-modules/files/238-netdevice.patch b/app-emulation/vmware-modules/files/238-netdevice.patch
deleted file mode 100644
index 35231a3..0000000
--- a/app-emulation/vmware-modules/files/238-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- #   define net_device device
- #endif
- 
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
-+					   functions are available. */
-+#define HAVE_FREE_NETDEV		/* free_netdev() */
-+#define HAVE_NETDEV_PRIV		/* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
- 
- /*
-  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting

diff --git a/app-emulation/vmware-modules/files/238-sema.patch b/app-emulation/vmware-modules/files/238-sema.patch
deleted file mode 100644
index 1ebdab7..0000000
--- a/app-emulation/vmware-modules/files/238-sema.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ru original//vmci-only/include/compat_semaphore.h patched//vmci-only/include/compat_semaphore.h
---- original//vmci-only/include/compat_semaphore.h	2010-11-11 15:37:25.000000000 -0500
-+++ patched//vmci-only/include/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 
-diff -ru original//vmmon-only/linux/driver.c patched//vmmon-only/linux/driver.c
---- original//vmmon-only/linux/driver.c	2010-11-11 15:37:22.000000000 -0500
-+++ patched//vmmon-only/linux/driver.c	2010-11-29 23:09:16.000000000 -0500
-@@ -145,7 +145,7 @@
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
-     (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT))
--#  define kernel_locked_by_current() kernel_locked()
-+#  define kernel_locked_by_current() (current->lock_depth >= 0)
- #else
- #  define kernel_locked_by_current() 0
- #endif
-@@ -170,6 +170,7 @@
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #endif
-diff -ru original//vmnet-only/compat_semaphore.h patched//vmnet-only/compat_semaphore.h
---- original//vmnet-only/compat_semaphore.h	2010-11-11 15:37:23.000000000 -0500
-+++ patched//vmnet-only/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 
-diff -ru original//vsock-only/shared/compat_semaphore.h patched//vsock-only/shared/compat_semaphore.h
---- original//vsock-only/shared/compat_semaphore.h	2010-11-11 13:04:44.000000000 -0500
-+++ patched//vsock-only/shared/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 

diff --git a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
deleted file mode 100644
index 3f1cd03..0000000
--- a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index 1a0e753..089aba3 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #endif
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 5847323..9042b97 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -3702,7 +3702,7 @@ HostIFDoIoctl(struct file *filp,
-    if (filp->f_op->unlocked_ioctl) {
-       return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
-    }
--#endif
-+#else
-    if (filp->f_op->ioctl) {
-       long err;
- 
-@@ -3712,6 +3712,7 @@ HostIFDoIoctl(struct file *filp,
- 
-       return err;
-    }
-+#endif
- 
-    return -ENOIOCTLCMD;
- }

diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
deleted file mode 100644
index 87f8914..0000000
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 <linux/export.h>
-+#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..5b71339 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.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-    dev->stop = VNetNetifClose;
-    dev->get_stats = VNetNetifGetStats;
-    dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-    dev->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 +618,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/files/264-apic.patch b/app-emulation/vmware-modules/files/264-apic.patch
deleted file mode 100644
index 66cd459..0000000
--- a/app-emulation/vmware-modules/files/264-apic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index f1f4b10..c43242f 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -55,6 +55,7 @@
- #include <linux/kthread.h>
- #include <linux/wait.h>
- 
-+#include <asm/apic.h>
- 
- #include "vmware.h"
- #include "x86apic.h"

diff --git a/app-emulation/vmware-modules/files/264-d-make-root.patch b/app-emulation/vmware-modules/files/264-d-make-root.patch
deleted file mode 100644
index a02e4ce..0000000
--- a/app-emulation/vmware-modules/files/264-d-make-root.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
-index b7c535e..a36a01e 100644
---- a/vmblock-only/linux/filesystem.c
-+++ b/vmblock-only/linux/filesystem.c
-@@ -525,7 +525,11 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
-       return -EINVAL;
-    }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
-    rootDentry = d_alloc_root(rootInode);
-+#else
-+   rootDentry = d_make_root(rootInode);
-+#endif
-    if (!rootDentry) {
-       iput(rootInode);
-       return -ENOMEM;

diff --git a/app-emulation/vmware-modules/files/264-jobserver.patch b/app-emulation/vmware-modules/files/264-jobserver.patch
deleted file mode 100644
index 59a6ccc..0000000
--- a/app-emulation/vmware-modules/files/264-jobserver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
---- a/work/vmblock-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmblock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
---- a/work/vmci-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmci-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
---- a/work/vmmon-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmmon-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
---- a/work/vmnet-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vmnet-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
---- a/work/vsock-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vsock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 

diff --git a/app-emulation/vmware-modules/files/264-makefile-include.patch b/app-emulation/vmware-modules/files/264-makefile-include.patch
deleted file mode 100644
index 39c3000..0000000
--- a/app-emulation/vmware-modules/files/264-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
-index ab7a727..e3ec9d2 100644
---- a/vmblock-only/Makefile.kernel
-+++ b/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
-diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
-index ba343ee..861ea83 100644
---- a/vmci-only/Makefile.kernel
-+++ b/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- obj-m += $(DRIVER).o
- 
-diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
-index 8770d1d..c4746c3 100644
---- a/vmmon-only/Makefile.kernel
-+++ b/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
- 
-diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
-index d1e3133..665d428 100644
---- a/vmnet-only/Makefile.kernel
-+++ b/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
-diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
-index b4629ee..264b8cb 100644
---- a/vsock-only/Makefile.kernel
-+++ b/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
- 
- 

diff --git a/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d1..0000000
--- a/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws

diff --git a/app-emulation/vmware-modules/files/264-netdevice.patch b/app-emulation/vmware-modules/files/264-netdevice.patch
deleted file mode 100644
index 35231a3..0000000
--- a/app-emulation/vmware-modules/files/264-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- #   define net_device device
- #endif
- 
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
-+					   functions are available. */
-+#define HAVE_FREE_NETDEV		/* free_netdev() */
-+#define HAVE_NETDEV_PRIV		/* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
- 
- /*
-  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting

diff --git a/app-emulation/vmware-modules/files/264-putname.patch b/app-emulation/vmware-modules/files/264-putname.patch
deleted file mode 100644
index 6e76130..0000000
--- a/app-emulation/vmware-modules/files/264-putname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
-index 79716bd..2dd83fe 100644
---- a/vmblock-only/linux/control.c
-+++ b/vmblock-only/linux/control.c
-@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
- 
-    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
- 
--   putname(name);
-+   __putname(name);
- 
-    return retval;
- }

diff --git a/app-emulation/vmware-modules/files/271-apic.patch b/app-emulation/vmware-modules/files/271-apic.patch
deleted file mode 100644
index 66cd459..0000000
--- a/app-emulation/vmware-modules/files/271-apic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index f1f4b10..c43242f 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -55,6 +55,7 @@
- #include <linux/kthread.h>
- #include <linux/wait.h>
- 
-+#include <asm/apic.h>
- 
- #include "vmware.h"
- #include "x86apic.h"

diff --git a/app-emulation/vmware-modules/files/271-makefile-include.patch b/app-emulation/vmware-modules/files/271-makefile-include.patch
deleted file mode 100644
index 39c3000..0000000
--- a/app-emulation/vmware-modules/files/271-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
-index ab7a727..e3ec9d2 100644
---- a/vmblock-only/Makefile.kernel
-+++ b/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
-diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
-index ba343ee..861ea83 100644
---- a/vmci-only/Makefile.kernel
-+++ b/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- obj-m += $(DRIVER).o
- 
-diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
-index 8770d1d..c4746c3 100644
---- a/vmmon-only/Makefile.kernel
-+++ b/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
- 
-diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
-index d1e3133..665d428 100644
---- a/vmnet-only/Makefile.kernel
-+++ b/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
-diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
-index b4629ee..264b8cb 100644
---- a/vsock-only/Makefile.kernel
-+++ b/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
- 
- 

diff --git a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch
deleted file mode 100644
index 1a647a3..0000000
--- a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
-index 2b81323..746c8b8 100644
---- a/vmblock-only/Makefile
-+++ b/vmblock-only/Makefile
-@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
- ifdef LINUXINCLUDE
- HEADER_DIR = $(LINUXINCLUDE)
- else
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- endif
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := ws
-diff --git a/vmci-only/Makefile b/vmci-only/Makefile
-index 8e9c5be..6ec828b 100644
---- a/vmci-only/Makefile
-+++ b/vmci-only/Makefile
-@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
- ifdef LINUXINCLUDE
- HEADER_DIR = $(LINUXINCLUDE)
- else
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- endif
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := ws
-diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
-index 5bd867b..91a83d4 100644
---- a/vmmon-only/Makefile
-+++ b/vmmon-only/Makefile
-@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
- ifdef LINUXINCLUDE
- HEADER_DIR = $(LINUXINCLUDE)
- else
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- endif
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
-index d4eb73c..c7c6d38 100644
---- a/vmnet-only/Makefile
-+++ b/vmnet-only/Makefile
-@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
- ifdef LINUXINCLUDE
- HEADER_DIR = $(LINUXINCLUDE)
- else
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- endif
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/vsock-only/Makefile b/vsock-only/Makefile
-index 93dd61d..9765696 100644
---- a/vsock-only/Makefile
-+++ b/vsock-only/Makefile
-@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
- ifdef LINUXINCLUDE
- HEADER_DIR = $(LINUXINCLUDE)
- else
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- endif
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws

diff --git a/app-emulation/vmware-modules/files/271-netdevice.patch b/app-emulation/vmware-modules/files/271-netdevice.patch
deleted file mode 100644
index 35231a3..0000000
--- a/app-emulation/vmware-modules/files/271-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- #   define net_device device
- #endif
- 
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
-+					   functions are available. */
-+#define HAVE_FREE_NETDEV		/* free_netdev() */
-+#define HAVE_NETDEV_PRIV		/* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
- 
- /*
-  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting

diff --git a/app-emulation/vmware-modules/files/271-putname.patch b/app-emulation/vmware-modules/files/271-putname.patch
deleted file mode 100644
index 6e76130..0000000
--- a/app-emulation/vmware-modules/files/271-putname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
-index 79716bd..2dd83fe 100644
---- a/vmblock-only/linux/control.c
-+++ b/vmblock-only/linux/control.c
-@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
- 
-    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
- 
--   putname(name);
-+   __putname(name);
- 
-    return retval;
- }

diff --git a/app-emulation/vmware-modules/files/271-vmmon.patch b/app-emulation/vmware-modules/files/271-vmmon.patch
deleted file mode 100644
index f197964..0000000
--- a/app-emulation/vmware-modules/files/271-vmmon.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru source900/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
---- source900/vmmon-only/linux/hostif.c		2012-07-23 18:18:55.000000000 +0900
-+++ source/vmmon-only/linux/hostif.c	    2012-08-03 16:20:23.200420885 +0900
-@@ -48,6 +48,7 @@
- #include <linux/smp_lock.h>
- #endif
- 
-+#include <asm/asm.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
- #include <linux/mc146818rtc.h>
-@@ -3586,31 +3587,14 @@
- {
-    int ret;
-    unsigned low, high;
--#if defined(VM_X86_64)
-    asm volatile("2: rdmsr ; xor %0,%0\n"
-                 "1:\n\t"
-                 ".section .fixup,\"ax\"\n\t"
-                 "3: mov %4,%0 ; jmp 1b\n\t"
-                 ".previous\n\t"
--                ".section __ex_table,\"a\"\n\t"
--                ".balign 8\n"
--                ".quad 2b,3b\n"
--                ".previous\n"
-+                _ASM_EXTABLE(2b,3b)
-                 : "=r"(ret), "=a"(low), "=d"(high)
-                 : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
--#else
--   asm volatile("2: rdmsr ; xor %0,%0\n"
--                "1:\n\t"
--                ".section .fixup,\"ax\"\n\t"
--                "3: mov %4,%0 ; jmp 1b\n\t"
--                ".previous\n\t"
--                ".section __ex_table,\"a\"\n"
--                ".balign 4\n"
--                ".long 2b,3b\n"
--                ".previous\n"
--                : "=r"(ret), "=a"(low), "=d"(high)
--                : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
--#endif // VM_X86_64
-    *val = (low | ((u64)(high) << 32));
- 
-    return ret;

diff --git a/app-emulation/vmware-modules/files/hardened.patch b/app-emulation/vmware-modules/files/hardened.patch
deleted file mode 100644
index ea1b0f3..0000000
--- a/app-emulation/vmware-modules/files/hardened.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
-index 921f25c..41a39e3 100644
---- a/vmci-only/linux/driver.c
-+++ b/vmci-only/linux/driver.c
-@@ -241,7 +241,24 @@ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
- #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0)
- #endif
- 
--static struct file_operations vmuser_fops;
-+/*
-+ * Moved file operations initialize here because of incompatibilites
-+ * with Gentoo hardened profile/hardend Linux 3.
-+ */
-+static struct file_operations vmuser_fops = {
-+    .owner = THIS_MODULE,
-+    .poll = LinuxDriverPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+    .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
-+#else
-+    .ioctl = LinuxDriver_Ioctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+    .compat_ioctl = LinuxDriver_UnlockedIoctl,
-+#endif
-+    .open = LinuxDriver_Open,
-+    .release = LinuxDriver_Close
-+};
- 
- 
- /*
-@@ -378,26 +395,6 @@ vmci_host_init(void)
-       return -ENOMEM;
-    }
- 
--   /*
--    * Initialize the file_operations structure. Because this code is always
--    * compiled as a module, this is fine to do it here and not in a static
--    * initializer.
--    */
--
--   memset(&vmuser_fops, 0, sizeof vmuser_fops);
--   vmuser_fops.owner = THIS_MODULE;
--   vmuser_fops.poll = LinuxDriverPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
--   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
--#else
--   vmuser_fops.ioctl = LinuxDriver_Ioctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
--   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
--#endif
--   vmuser_fops.open = LinuxDriver_Open;
--   vmuser_fops.release = LinuxDriver_Close;
--
-    sprintf(linuxState.deviceName, "vmci");
-    linuxState.major = 10;
-    linuxState.misc.minor = MISC_DYNAMIC_MINOR;
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index b21dd44..960c2aa 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
- #endif
- };
- 
--static struct file_operations vmuser_fops;
-+static struct file_operations vmuser_fops = {
-+   .owner = THIS_MODULE,
-+   .poll = LinuxDriverPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+   .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
-+#else
-+   .ioctl = LinuxDriver_Ioctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+   .compat_ioctl = LinuxDriver_UnlockedIoctl,
-+#endif
-+   .open = LinuxDriver_Open,
-+   .release = LinuxDriver_Close,
-+   .mmap = LinuxDriverMmap
-+};
-+
- static struct timer_list tscTimer;
- 
- /*
-@@ -357,27 +372,6 @@ init_module(void)
-    spin_lock_init(&linuxState.pollListLock);
- #endif
- 
--   /*
--    * Initialize the file_operations structure. Because this code is always
--    * compiled as a module, this is fine to do it here and not in a static
--    * initializer.
--    */
--
--   memset(&vmuser_fops, 0, sizeof vmuser_fops);
--   vmuser_fops.owner = THIS_MODULE;
--   vmuser_fops.poll = LinuxDriverPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
--   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
--#else
--   vmuser_fops.ioctl = LinuxDriver_Ioctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
--   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
--#endif
--   vmuser_fops.open = LinuxDriver_Open;
--   vmuser_fops.release = LinuxDriver_Close;
--   vmuser_fops.mmap = LinuxDriverMmap;
--
- #ifdef VMX86_DEVEL
-    devel_init_module();
-    linuxState.minor = 0;
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index b12b982..40bd4cf 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -165,7 +165,22 @@ static long  VNetFileOpUnlockedIoctl(struct file * filp,
-                                      unsigned int iocmd, unsigned long ioarg);
- #endif
- 
--static struct file_operations vnetFileOps;
-+static struct file_operations vnetFileOps = {
-+   .owner = THIS_MODULE,
-+   .read = VNetFileOpRead,
-+   .write = VNetFileOpWrite,
-+   .poll = VNetFileOpPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+   .unlocked_ioctl = VNetFileOpUnlockedIoctl,
-+#else
-+   .ioctl = VNetFileOpIoctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+   .compat_ioctl = VNetFileOpUnlockedIoctl,
-+#endif
-+   .open = VNetFileOpOpen,
-+   .release = VNetFileOpClose
-+};
- 
- /*
-  * Utility functions
-@@ -476,28 +491,6 @@ init_module(void)
-       goto err_proto;
-    }
- 
--   /*
--    * Initialize the file_operations structure. Because this code is always
--    * compiled as a module, this is fine to do it here and not in a static
--    * initializer.
--    */
--
--   memset(&vnetFileOps, 0, sizeof vnetFileOps);
--   vnetFileOps.owner = THIS_MODULE;
--   vnetFileOps.read = VNetFileOpRead;
--   vnetFileOps.write = VNetFileOpWrite;
--   vnetFileOps.poll = VNetFileOpPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
--   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
--#else
--   vnetFileOps.ioctl = VNetFileOpIoctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
--   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
--#endif
--   vnetFileOps.open = VNetFileOpOpen;
--   vnetFileOps.release = VNetFileOpClose;
--
-    retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
-    if (retval) {
-       LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",

diff --git a/app-emulation/vmware-modules/files/iommu_map.patch b/app-emulation/vmware-modules/files/iommu_map.patch
deleted file mode 100644
index bf714b0..0000000
--- a/app-emulation/vmware-modules/files/iommu_map.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru8 original//vmmon-only/linux/iommu.c patched//vmmon-only/linux/iommu.c
---- original//vmmon-only/linux/iommu.c	2010-05-21 02:45:24.000000000 -0400
-+++ patched//vmmon-only/linux/iommu.c	2010-06-16 10:39:09.000000000 -0400
-@@ -148,17 +148,17 @@
-             printk(KERN_ERR "%s: the physical page number 0x%x is not valid.\n",
-                    __func__, mpn);
-             status = -EINVAL;
-             goto out;
-          }
-          map_to =  PPN_2_PA(mpn);
-          map_prot = IOMMU_READ | IOMMU_WRITE;
-       }
--      if ((status = iommu_map_range(vmLinux->iommuDomain,
-+      if ((status = iommu_map(vmLinux->iommuDomain,
-                                     PPN_2_PA(ppn),
-                                     map_to, PAGE_SIZE, map_prot))) {
-          printk(KERN_ERR "%s: IOMMU Mapping of PPN 0x%x -> MPN 0x%x "
-                 "could not be established.\n", __func__, ppn, mpn);
-          goto out;
-       }
-    }
-    printk(KERN_DEBUG "%s: IOMMU domain is created.\n", __func__);
-@@ -395,17 +395,17 @@
-          list_del(&passthruDevice->list);
-          IOMMUUnregisterDeviceInt(passthruDevice);
-       }
-    }
-    spin_unlock(&passthruDeviceListLock);
- 
-    /* Relinquish the IOMMU domain used by this VM. */
-    for (ppn = 0; ppn < vmLinux->numPages; ppn++) {
--      iommu_unmap_range(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
-+      iommu_unmap(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
-    }
-    if (vmLinux->iommuDomain) {
-       iommu_domain_free(vmLinux->iommuDomain);
-       vmLinux->iommuDomain = NULL;
-       printk(KERN_INFO "%s: IOMMU domain is destroyed.\n", __func__);
-    }
- }
- 

diff --git a/app-emulation/vmware-modules/files/sk_sleep.patch b/app-emulation/vmware-modules/files/sk_sleep.patch
deleted file mode 100644
index 583b6c8..0000000
--- a/app-emulation/vmware-modules/files/sk_sleep.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -ru8 original//vsock-only/linux/af_vsock.c patched//vsock-only/linux/af_vsock.c
---- original//vsock-only/linux/af_vsock.c	2010-05-21 00:17:27.000000000 -0400
-+++ patched//vsock-only/linux/af_vsock.c	2010-06-15 23:48:52.000000000 -0400
-@@ -3216,17 +3216,17 @@
-    }
- 
-    /*
-     * The receive path will handle all communication until we are able to enter
-     * the connected state.  Here we wait for the connection to be completed or
-     * a notification of an error.
-     */
-    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
-       if (timeout == 0) {
-          /*
-           * If we're not going to block, skip ahead to preserve error code set
-           * above.
-           */
-          goto outWait;
-@@ -3239,29 +3239,29 @@
-       if (signal_pending(current)) {
-          err = sock_intr_errno(timeout);
-          goto outWaitError;
-       } else if (timeout == 0) {
-          err = -ETIMEDOUT;
-          goto outWaitError;
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (sk->compat_sk_err) {
-       err = -sk->compat_sk_err;
-       goto outWaitError;
-    } else {
-       ASSERT(sk->compat_sk_state == SS_CONNECTED);
-       err = 0;
-    }
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
- 
- outWaitError:
-    sk->compat_sk_state = SS_UNCONNECTED;
-    sock->state = SS_UNCONNECTED;
-    goto outWait;
-@@ -3311,33 +3311,33 @@
-       goto out;
-    }
- 
-    /*
-     * Wait for children sockets to appear; these are the new sockets created
-     * upon connection establishment.
-     */
-    timeout = sock_sndtimeo(listener, flags & O_NONBLOCK);
--   compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
- 
-    while ((connected = VSockVmciDequeueAccept(listener)) == NULL &&
-           listener->compat_sk_err == 0) {
-       release_sock(listener);
-       timeout = schedule_timeout(timeout);
-       lock_sock(listener);
- 
-       if (signal_pending(current)) {
-          err = sock_intr_errno(timeout);
-          goto outWait;
-       } else if (timeout == 0) {
-          err = -EAGAIN;
-          goto outWait;
-       }
- 
--      compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (listener->compat_sk_err) {
-       err = -listener->compat_sk_err;
-    }
- 
-    if (connected) {
-       listener->compat_sk_ack_backlog--;
-@@ -3361,17 +3361,17 @@
- 
-       newsock->state = SS_CONNECTED;
-       sock_graft(connected, newsock);
-       release_sock(connected);
-       sock_put(connected);
-    }
- 
- outWait:
--   compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING);
- out:
-    release_sock(listener);
-    return err;
- }
- 
- 
- /*
-  *----------------------------------------------------------------------------
-@@ -3459,17 +3459,17 @@
- {
-    struct sock *sk;
-    unsigned int mask;
-    VSockVmciSock *vsk;
- 
-    sk = sock->sk;
-    vsk = vsock_sk(sk);
- 
--   poll_wait(file, sk->compat_sk_sleep, wait);
-+   poll_wait(file, compat_sk_sleep(sk), wait);
-    mask = 0;
- 
-    if (sk->compat_sk_err) {
-       /* Signify that there has been an error on this socket. */
-       mask |= POLLERR;
-    }
- 
-    /*
-@@ -4099,17 +4099,17 @@
-     */
-    timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
- 
-    NOTIFYCALLRET(vsk, err, sendInit, sk, &sendData);
-    if (err < 0) {
-       goto out;
-    }
- 
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (totalWritten < len) {
-       Bool sentWrote;
-       unsigned int retries;
-       ssize_t written;
- 
-       sentWrote = FALSE;
-       retries = 0;
-@@ -4136,17 +4136,17 @@
-          if (signal_pending(current)) {
-             err = sock_intr_errno(timeout);
-             goto outWait;
-          } else if (timeout == 0) {
-             err = -EAGAIN;
-             goto outWait;
-          }
- 
--         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
-+         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
-                                      &wait, TASK_INTERRUPTIBLE);
-       }
- 
-       /*
-        * These checks occur both as part of and after the loop conditional
-        * since we need to check before and after sleeping.
-        */
-       if (sk->compat_sk_err) {
-@@ -4189,17 +4189,17 @@
-    }
- 
-    ASSERT(totalWritten <= INT_MAX);
- 
- outWait:
-    if (totalWritten > 0) {
-       err = totalWritten;
-    }
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
- }
- 
- 
- /*
-  *----------------------------------------------------------------------------
-@@ -4423,17 +4423,17 @@
-    timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
-    copied = 0;
- 
-    NOTIFYCALLRET(vsk, err, recvInit, sk, target, &recvData);
-    if (err < 0) {
-       goto out;
-    }
- 
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while ((ready = VSockVmciStreamHasData(vsk)) < target &&
-           sk->compat_sk_err == 0 &&
-           !(sk->compat_sk_shutdown & RCV_SHUTDOWN) &&
-           !(vsk->peerShutdown & SEND_SHUTDOWN)) {
- 
-       if (ready < 0) {
-          /*
-@@ -4463,17 +4463,17 @@
-       if (signal_pending(current)) {
-          err = sock_intr_errno(timeout);
-          goto outWait;
-       } else if (timeout == 0) {
-          err = -EAGAIN;
-          goto outWait;
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (sk->compat_sk_err) {
-       err = -sk->compat_sk_err;
-       goto outWait;
-    } else if (sk->compat_sk_shutdown & RCV_SHUTDOWN) {
-       err = 0;
-       goto outWait;
-@@ -4529,17 +4529,17 @@
-    if (err < 0) {
-       goto outWait;
-    }
- 
-    ASSERT(copied <= INT_MAX);
-    err = copied;
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
- }
- 
- 
- /*
-  * Protocol operation.

diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
deleted file mode 100644
index e579266..0000000
--- a/app-emulation/vmware-modules/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>vmware</herd>
-    <use>
-        <flag name="pax_kernel"></flag>
-    </use>
-</pkgmetadata>

diff --git a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
deleted file mode 100644
index 447af26..0000000
--- a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-238.6.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-3.1.${PV_MINOR}*
-		 =app-emulation/vmware-workstation-7.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
-	kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
-	kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-264.5.ebuild b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
deleted file mode 100644
index 9635470..0000000
--- a/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-4.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-8.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-271.2.ebuild b/app-emulation/vmware-modules/vmware-modules-271.2.ebuild
deleted file mode 100644
index d874dca..0000000
--- a/app-emulation/vmware-modules/vmware-modules-271.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.4.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2014-10-10 13:55 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2014-10-10 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     afba145791293bf201c88e3e4c4b0dad9ec3ac54
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu Oct  9 21:16:53 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Oct  9 21:16:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=afba1457

compiles cleanly with 3.11, moving onto 3.12

---
 .../vmware-modules/files/271-3.11-00-readdir.patch | 38 ++++++++++++++++
 .../vmware-modules/files/271-3.11-01-filldir.patch | 50 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  | 21 +++++++--
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
new file mode 100644
index 0000000..15a9a8f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
@@ -0,0 +1,38 @@
+diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only/linux/file.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/file.c	2014-04-26 10:58:03.062635343 -0400
+@@ -166,11 +166,9 @@
+ 
+ static int
+ FileOpReaddir(struct file *file,  // IN
+-              void *dirent,       // IN
+-              filldir_t filldir)  // IN
++		struct dir_context *ctx)
+ {
+    int ret;
+-   FilldirInfo info;
+    struct file *actualFile;
+ 
+    if (!file) {
+@@ -184,11 +182,8 @@
+       return -EINVAL;
+    }
+ 
+-   info.filldir = filldir;
+-   info.dirent = dirent;
+-
+    actualFile->f_pos = file->f_pos;
+-   ret = vfs_readdir(actualFile, Filldir, &info);
++   ret = iterate_dir(actualFile, ctx);
+    file->f_pos = actualFile->f_pos;
+ 
+    return ret;
+@@ -237,7 +232,7 @@
+ 
+ 
+ struct file_operations RootFileOps = {
+-   .readdir = FileOpReaddir,
++   .iterate = FileOpReaddir,
+    .open    = FileOpOpen,
+    .release = FileOpRelease,
+ };

diff --git a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
new file mode 100644
index 0000000..d36c61a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
@@ -0,0 +1,50 @@
+diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
+--- vmblock-only/linux/file.c	2014-10-07 23:22:46.832469618 -0400
++++ vmblock-only.new/linux/file.c	2014-10-07 23:24:35.276472720 -0400
+@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
+ typedef ino_t inode_num_t;
+ #endif
+ 
+-/* Specifically for our filldir_t callback */
+-typedef struct FilldirInfo {
+-   filldir_t filldir;
+-   void *dirent;
+-} FilldirInfo;
+-
+-
+-/*
+- *----------------------------------------------------------------------------
+- *
+- * Filldir --
+- *
+- *    Callback function for readdir that we use in place of the one provided.
+- *    This allows us to specify that each dentry is a symlink, but pass through
+- *    everything else to the original filldir function.
+- *
+- * Results:
+- *    Original filldir's return value.
+- *
+- * Side effects:
+- *    Directory information gets copied to user's buffer.
+- *
+- *----------------------------------------------------------------------------
+- */
+-
+-static int
+-Filldir(void *buf,              // IN: Dirent buffer passed from FileOpReaddir
+-        const char *name,       // IN: Dirent name
+-        int namelen,            // IN: len of dirent's name
+-        loff_t offset,          // IN: Offset
+-        inode_num_t ino,        // IN: Inode number of dirent
+-        unsigned int d_type)    // IN: Type of file
+-{
+-   FilldirInfo *info = buf;
+-
+-   /* Specify DT_LNK regardless */
+-   return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
+-}
+-
+-
+ /* File operations */
+ 
+ /*

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 72b49b0..7b2771a 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -66,10 +66,23 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-271-3.10-00-userns.patch
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-271-3.10-01-create_proc_entry.patch
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-271-3.10-02-getname.patch
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-271-3.10-03-deprecated.patch
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch"	
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-06-inode.patch"
+	
+	# fixes a memcpy/memcmp bug in the hub code
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-07-hub.patch"
+	
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+
+
+
+
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2014-10-10 13:55 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2014-10-10 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a47d968589d7559e72d5f8cc4e957ea3b9fb78d2
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu Oct  9 21:20:45 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Oct  9 21:20:45 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a47d9685

compiles with 3.12/3.13, moving onto 3.14

---
 .../vmware-modules/files/271-3.13-00-vmnet.patch   | 36 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
new file mode 100644
index 0000000..4e9d7e9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -0,0 +1,36 @@
+--- work/vmnet-only/filter.c   2013-08-27 20:29:04.000000000 +0100
++++ patched/vmnet-only/filter.c   2014-01-26 01:09:05.184893854 +0000
+@@ -27,6 +27,7 @@
+ #include "compat_module.h"
+ #include <linux/mutex.h>
+ #include <linux/netdevice.h>
++#include <linux/version.h>
+ #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
+ #   include <linux/module.h>
+ #else
+@@ -203,7 +204,11 @@
+ #endif
+
+ static unsigned int
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum,                 // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+                  struct sk_buff *skb,                  // IN:
+ #else
+@@ -252,7 +257,12 @@
+
+    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++
++   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+
+    packetHeader = compat_skb_network_header(skb);
+    ip = (struct iphdr*)packetHeader;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 7b2771a..e922472 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
 
-
+	kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch"
 
 
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2014-10-11 15:52 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2014-10-11 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8435434eab0fc7c5d08581822ebda283458578c1
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Sat Oct 11 15:40:41 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Sat Oct 11 15:40:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=8435434e

adding vmware-modules-279.2-r1, (workstation 10) which compiles cleanrly on 3.10.0, 3.11.0 and 3.12.0

---
 .../vmware-modules/files/279-3.10-00-userns.patch  |  37 +++++++
 .../vmware-modules/files/279-3.10-01-getname.patch |  19 ++++
 .../files/279-3.10-02-unused-typedef.patch         | 112 ++++++++++++++++++++
 .../vmware-modules/files/279-3.10-03-dentry.patch  |  30 ++++++
 .../vmware-modules/files/279-3.10-04-inode.patch   |  31 ++++++
 .../vmware-modules/files/279-3.10-05-hub.patch     |  21 ++++
 app-emulation/vmware-modules/files/279-apic.patch  |  12 +++
 .../vmware-modules/files/279-filldir.patch         |  91 +++++++++++++++++
 .../vmware-modules/files/279-hardened.patch        | 113 +++++++++++++++++++++
 .../files/279-makefile-include.patch               |  65 ++++++++++++
 .../files/279-makefile-kernel-dir.patch            |  85 ++++++++++++++++
 .../vmware-modules/files/279-netdevice.patch       |  24 +++++
 .../vmware-modules/files/279-putname.patch         |  13 +++
 .../vmware-modules/files/279-vmblock.patch         |  23 +++++
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  | 109 ++++++++++++++++++++
 15 files changed, 785 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
new file mode 100644
index 0000000..c960b78
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
@@ -0,0 +1,37 @@
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.000000000 +0100
++++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.000000000 +0100
+@@ -135,7 +135,8 @@
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+-   inode->i_uid = inode->i_gid = 0;
++   inode->i_uid = GLOBAL_ROOT_UID;
++   inode->i_gid = GLOBAL_ROOT_GID;
+    inode->i_op = &LinkInodeOps;
+ 
+    d_add(dentry, inode);
+
+--- a/vmci-only/linux/driver.c    2013-03-20 17:57:35.000000000 +0100
++++ b/vmci-only/linux/driver.c    2013-03-20 17:57:43.000000000 +0100
+@@ -740,7 +740,7 @@
+          goto init_release;
+       }
+ 
+-      user = current_uid();
++      user = from_kuid(current_user_ns(), current_uid());
+       retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
+                                        0 /* Unused */, vmciLinux->userVersion,
+                                        &user, &vmciLinux->context);
+
+--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100
++++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100
+@@ -2866,7 +2866,7 @@
+       vsk->connectTimeout = psk->connectTimeout;
+    } else {
+       vsk->trusted = capable(CAP_NET_ADMIN);
+-      vsk->owner = current_uid();
++      vsk->owner = from_kuid(current_user_ns(), current_uid());
+       vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
+       vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
+       vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
+

diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
new file mode 100644
index 0000000..7bcf536
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
@@ -0,0 +1,19 @@
+--- vmblock-only/linux/control.c	2014-03-15 15:28:40.871076076 +0100
++++ vmblock-only/linux/control.c.new	2014-03-15 15:29:15.079074439 +0100
+@@ -279,11 +279,17 @@
+    int i;
+    int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+    if (IS_ERR(name)) {
+       return PTR_ERR(name);
+    }
+ 
++   i = strncpy_from_user(name, buf, PATH_MAX);
++   if (i < 0 || i == PATH_MAX) {
++      __putname(name);
++      return -EINVAL;
++   }
++
+    for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {

diff --git a/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
new file mode 100644
index 0000000..d030110
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
@@ -0,0 +1,112 @@
+--- vmblock-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
++++ vmblock-only/shared/vm_assert.h	2014-10-07 22:48:01.346409957 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmci-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
++++ vmci-only/shared/vm_assert.h	2014-10-07 22:47:51.829409685 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmmon-only/include/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
++++ vmmon-only/include/vm_assert.h	2014-10-07 22:47:39.246409325 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmnet-only/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
++++ vmnet-only/vm_assert.h	2014-10-07 22:47:55.804409799 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vsock-only/shared/vm_assert.h	2014-10-07 22:47:11.595408534 -0400
++++ vsock-only/shared/vm_assert.h	2014-10-07 22:45:55.715406363 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vsock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only/shared/vm_atomic.h	2014-10-07 22:53:06.024418673 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+--- vmci-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vmci-only/shared/vm_atomic.h	2014-10-07 22:53:24.873419213 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+
+--- vmblock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vmblock-only/shared/vm_atomic.h	2014-10-07 22:53:31.073419390 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+
+--- vmnet-only/vm_atomic.h	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only/vm_atomic.h	2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+																			   
+--- vmmon-only/include/vm_atomic.h   2013-11-06 00:40:52.000000000 -0500
++++ vmmon-only/include/vm_atomic.h   2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch
new file mode 100644
index 0000000..8acecf5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch
@@ -0,0 +1,30 @@
+diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only/linux/dentry.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/dentry.c	2014-04-26 10:58:03.062635343 -0400
+@@ -32,7 +32,7 @@
+ #include "block.h"
+ 
+ 
+-static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
+ 
+ struct dentry_operations LinkDentryOps = {
+    .d_revalidate = DentryOpRevalidate,
+@@ -60,7 +60,7 @@
+ 
+ static int
+ DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-                   struct nameidata *nd)   // IN: lookup flags & intent
++                   unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+    struct nameidata actualNd;
+@@ -101,7 +101,7 @@
+    if (actualDentry &&
+        actualDentry->d_op &&
+        actualDentry->d_op->d_revalidate) {
+-      return actualDentry->d_op->d_revalidate(actualDentry, nd);
++      return actualDentry->d_op->d_revalidate(actualDentry, flags);
+    }
+ 
+    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {

diff --git a/app-emulation/vmware-modules/files/279-3.10-04-inode.patch b/app-emulation/vmware-modules/files/279-3.10-04-inode.patch
new file mode 100644
index 0000000..0d30dbe
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-04-inode.patch
@@ -0,0 +1,31 @@
+diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/inode.c	2014-04-26 10:58:03.063635343 -0400
+@@ -36,7 +36,7 @@
+ 
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++                                    struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++              unsigned int flags)   // IN: lookup intent and information
+ {
+    char *filename;
+    struct inode *inode;
+@@ -221,7 +221,8 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
++   ret = 0;
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)

diff --git a/app-emulation/vmware-modules/files/279-3.10-05-hub.patch b/app-emulation/vmware-modules/files/279-3.10-05-hub.patch
new file mode 100644
index 0000000..50ab341
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-05-hub.patch
@@ -0,0 +1,21 @@
+diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c
+--- vmnet-only/hub.c	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/hub.c	2014-10-07 18:45:34.403918680 -0400
+@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_
+ {
+    VNetHub *currHub = vnetHub;
+    while (currHub && (currHub->hubType != HUB_TYPE_PVN ||
+-		      memcmp(idNum, currHub->id.pvnID, sizeof idNum))) {
++		      memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) {
+       currHub = currHub->next;
+    }
+    return currHub;
+@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE
+ 
+       if (allocPvn) {
+ 	 hub->hubType = HUB_TYPE_PVN;
+-	 memcpy(hub->id.pvnID, id, sizeof id);
++	 memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN);
+ 	 ++pvnInstance;
+       } else {
+ 	 hub->hubType = HUB_TYPE_VNET;

diff --git a/app-emulation/vmware-modules/files/279-apic.patch b/app-emulation/vmware-modules/files/279-apic.patch
new file mode 100644
index 0000000..66cd459
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
+ 
++#include <asm/apic.h>
+ 
+ #include "vmware.h"
+ #include "x86apic.h"

diff --git a/app-emulation/vmware-modules/files/279-filldir.patch b/app-emulation/vmware-modules/files/279-filldir.patch
new file mode 100644
index 0000000..6eb1f31
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-filldir.patch
@@ -0,0 +1,91 @@
+diff --git a/vmblock-only/linux/file.c b/vmblock-only/linux/file.c
+index d7ac1f6..5499169 100644
+--- a/vmblock-only/linux/file.c
++++ b/vmblock-only/linux/file.c
+@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
+ typedef ino_t inode_num_t;
+ #endif
+ 
+-/* Specifically for our filldir_t callback */
+-typedef struct FilldirInfo {
+-   filldir_t filldir;
+-   void *dirent;
+-} FilldirInfo;
+-
+-
+-/*
+- *----------------------------------------------------------------------------
+- *
+- * Filldir --
+- *
+- *    Callback function for readdir that we use in place of the one provided.
+- *    This allows us to specify that each dentry is a symlink, but pass through
+- *    everything else to the original filldir function.
+- *
+- * Results:
+- *    Original filldir's return value.
+- *
+- * Side effects:
+- *    Directory information gets copied to user's buffer.
+- *
+- *----------------------------------------------------------------------------
+- */
+-
+-static int
+-Filldir(void *buf,              // IN: Dirent buffer passed from FileOpReaddir
+-        const char *name,       // IN: Dirent name
+-        int namelen,            // IN: len of dirent's name
+-        loff_t offset,          // IN: Offset
+-        inode_num_t ino,        // IN: Inode number of dirent
+-        unsigned int d_type)    // IN: Type of file
+-{
+-   FilldirInfo *info = buf;
+-
+-   /* Specify DT_LNK regardless */
+-   return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
+-}
+-
+-
+ /* File operations */
+ 
+ /*
+@@ -166,11 +126,10 @@ FileOpOpen(struct inode *inode,  // IN
+ 
+ static int
+ FileOpReaddir(struct file *file,  // IN
+-              void *dirent,       // IN
+-              filldir_t filldir)  // IN
++              struct dir_context *ctx)  // IN
+ {
+    int ret;
+-   FilldirInfo info;
++
+    struct file *actualFile;
+ 
+    if (!file) {
+@@ -184,12 +143,10 @@ FileOpReaddir(struct file *file,  // IN
+       return -EINVAL;
+    }
+ 
+-   info.filldir = filldir;
+-   info.dirent = dirent;
+-
+-   actualFile->f_pos = file->f_pos;
+-   ret = vfs_readdir(actualFile, Filldir, &info);
+-   file->f_pos = actualFile->f_pos;
++   /* Ricky Wong Yung Fei:
++    * Manipulation of pos is now handled internally by iterate_dir().
++    */
++   ret = iterate_dir(actualFile, ctx);
+ 
+    return ret;
+ }
+@@ -237,7 +194,7 @@ FileOpRelease(struct inode *inode, // IN
+ 
+ 
+ struct file_operations RootFileOps = {
+-   .readdir = FileOpReaddir,
++   .iterate = FileOpReaddir,
+    .open    = FileOpOpen,
+    .release = FileOpRelease,
+ };

diff --git a/app-emulation/vmware-modules/files/279-hardened.patch b/app-emulation/vmware-modules/files/279-hardened.patch
new file mode 100644
index 0000000..cc3e041
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-hardened.patch
@@ -0,0 +1,113 @@
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index b21dd44..960c2aa 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
+ #endif
+ };
+ 
+-static struct file_operations vmuser_fops;
++static struct file_operations vmuser_fops = {
++   .owner = THIS_MODULE,
++   .poll = LinuxDriverPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
++#else
++   .ioctl = LinuxDriver_Ioctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = LinuxDriver_UnlockedIoctl,
++#endif
++   .open = LinuxDriver_Open,
++   .release = LinuxDriver_Close,
++   .mmap = LinuxDriverMmap
++};
++
+ static struct timer_list tscTimer;
+ 
+ /*
+@@ -357,27 +372,6 @@ init_module(void)
+    spin_lock_init(&linuxState.pollListLock);
+ #endif
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vmuser_fops, 0, sizeof vmuser_fops);
+-   vmuser_fops.owner = THIS_MODULE;
+-   vmuser_fops.poll = LinuxDriverPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
+-#else
+-   vmuser_fops.ioctl = LinuxDriver_Ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
+-#endif
+-   vmuser_fops.open = LinuxDriver_Open;
+-   vmuser_fops.release = LinuxDriver_Close;
+-   vmuser_fops.mmap = LinuxDriverMmap;
+-
+ #ifdef VMX86_DEVEL
+    devel_init_module();
+    linuxState.minor = 0;
+diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
+index b12b982..40bd4cf 100644
+--- a/vmnet-only/driver.c
++++ b/vmnet-only/driver.c
+@@ -165,7 +165,22 @@ static long  VNetFileOpUnlockedIoctl(struct file * filp,
+                                      unsigned int iocmd, unsigned long ioarg);
+ #endif
+ 
+-static struct file_operations vnetFileOps;
++static struct file_operations vnetFileOps = {
++   .owner = THIS_MODULE,
++   .read = VNetFileOpRead,
++   .write = VNetFileOpWrite,
++   .poll = VNetFileOpPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = VNetFileOpUnlockedIoctl,
++#else
++   .ioctl = VNetFileOpIoctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = VNetFileOpUnlockedIoctl,
++#endif
++   .open = VNetFileOpOpen,
++   .release = VNetFileOpClose
++};
+ 
+ /*
+  * Utility functions
+@@ -476,28 +491,6 @@ init_module(void)
+       goto err_proto;
+    }
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vnetFileOps, 0, sizeof vnetFileOps);
+-   vnetFileOps.owner = THIS_MODULE;
+-   vnetFileOps.read = VNetFileOpRead;
+-   vnetFileOps.write = VNetFileOpWrite;
+-   vnetFileOps.poll = VNetFileOpPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
+-#else
+-   vnetFileOps.ioctl = VNetFileOpIoctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
+-#endif
+-   vnetFileOps.open = VNetFileOpOpen;
+-   vnetFileOps.release = VNetFileOpClose;
+-
+    retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
+    if (retval) {
+       LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",

diff --git a/app-emulation/vmware-modules/files/279-makefile-include.patch b/app-emulation/vmware-modules/files/279-makefile-include.patch
new file mode 100644
index 0000000..39c3000
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-makefile-include.patch
@@ -0,0 +1,65 @@
+diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
+index ab7a727..e3ec9d2 100644
+--- a/vmblock-only/Makefile.kernel
++++ b/vmblock-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE += -I$(SRCROOT)/include
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
+diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
+index ba343ee..861ea83 100644
+--- a/vmci-only/Makefile.kernel
++++ b/vmci-only/Makefile.kernel
+@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
+ 
+ INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ obj-m += $(DRIVER).o
+ 
+diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
+index 8770d1d..c4746c3 100644
+--- a/vmmon-only/Makefile.kernel
++++ b/vmmon-only/Makefile.kernel
+@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
+ 	   -I$(SRCROOT)/vmcore
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
+ 
+diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
+index d1e3133..665d428 100644
+--- a/vmnet-only/Makefile.kernel
++++ b/vmnet-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
+diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
+index b4629ee..264b8cb 100644
+--- a/vsock-only/Makefile.kernel
++++ b/vsock-only/Makefile.kernel
+@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
+ INCLUDE += -I$(SRCROOT)/linux
+ INCLUDE += -I$(SRCROOT)/common
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch
new file mode 100644
index 0000000..1a647a3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch
@@ -0,0 +1,85 @@
+diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
+index 2b81323..746c8b8 100644
+--- a/vmblock-only/Makefile
++++ b/vmblock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmblock
+ PRODUCT := ws
+diff --git a/vmci-only/Makefile b/vmci-only/Makefile
+index 8e9c5be..6ec828b 100644
+--- a/vmci-only/Makefile
++++ b/vmci-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmci
+ PRODUCT := ws
+diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
+index 5bd867b..91a83d4 100644
+--- a/vmmon-only/Makefile
++++ b/vmmon-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmmon
+ PRODUCT := @@PRODUCT@@
+diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
+index d4eb73c..c7c6d38 100644
+--- a/vmnet-only/Makefile
++++ b/vmnet-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmnet
+ PRODUCT := @@PRODUCT@@
+diff --git a/vsock-only/Makefile b/vsock-only/Makefile
+index 93dd61d..9765696 100644
+--- a/vsock-only/Makefile
++++ b/vsock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vsock
+ PRODUCT := ws

diff --git a/app-emulation/vmware-modules/files/279-netdevice.patch b/app-emulation/vmware-modules/files/279-netdevice.patch
new file mode 100644
index 0000000..35231a3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-netdevice.patch
@@ -0,0 +1,24 @@
+diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
+index 7a56304..9ff4548 100644
+--- a/vmnet-only/compat_netdevice.h
++++ b/vmnet-only/compat_netdevice.h
+@@ -47,6 +47,19 @@
+ #   define net_device device
+ #endif
+ 
++/* it looks like these have been removed from the kernel 3.1
++ * probably because the "transition" is considered complete.
++ * so to keep this source compatible we just redefine them like they were
++ * previously
++ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
++#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
++					   functions are available. */
++#define HAVE_FREE_NETDEV		/* free_netdev() */
++#define HAVE_NETDEV_PRIV		/* netdev_priv() */
++#define HAVE_NETIF_QUEUE
++#define HAVE_NET_DEVICE_OPS
++#endif
+ 
+ /*
+  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting

diff --git a/app-emulation/vmware-modules/files/279-putname.patch b/app-emulation/vmware-modules/files/279-putname.patch
new file mode 100644
index 0000000..6e76130
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-putname.patch
@@ -0,0 +1,13 @@
+diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/vmblock-only/linux/control.c
++++ b/vmblock-only/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
++   __putname(name);
+ 
+    return retval;
+ }

diff --git a/app-emulation/vmware-modules/files/279-vmblock.patch b/app-emulation/vmware-modules/files/279-vmblock.patch
new file mode 100644
index 0000000..0daf603
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-vmblock.patch
@@ -0,0 +1,23 @@
+diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
+--- work.orig/vmblock-only/linux/control.c	2013-11-02 18:05:39.960226399 +0100
++++ work/vmblock-only/linux/control.c	2013-11-02 18:09:11.760231432 +0100
+@@ -208,17 +208,14 @@
+    VMBlockSetProcEntryOwner(controlProcMountpoint);
+ 
+    /* Create /proc/fs/vmblock/dev */
+-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+-                                        VMBLOCK_CONTROL_MODE,
+-                                        controlProcDirEntry);
+-   if (!controlProcEntry) {
++   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
++   if (controlProcEntry == NULL) {
+       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
+       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+       remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
+       return -EINVAL;
+    }
+ 
+-   controlProcEntry->proc_fops = &ControlFileOps;
+    return 0;
+ }
+ 

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
new file mode 100644
index 0000000..1212ca8
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST_ALL}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-unused-typedef.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-inode.patch"
+
+	# fixes a memcpy/memcmp bug in the hub code
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch"
+	
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE=660
+		KERNEL=="vmw_vmci",  GROUP="vmware", MODE=660
+		KERNEL=="vmmon", GROUP="vmware", MODE=660
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	udev_dorules "${udevrules}"
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2014-10-11 15:52 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2014-10-11 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     195bd13fb5abc21ec6c31396b0a7018df192796d
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Sat Oct 11 15:51:14 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Sat Oct 11 15:51:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=195bd13f

now compiles on 3.17.0 :-)

---
 app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 12 ++++++++++++
 app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
new file mode 100644
index 0000000..fbe1741
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -0,0 +1,12 @@
+diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
+--- vmnet-only/netif.c	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/netif.c	2014-10-09 17:29:12.361307961 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName,  // IN:
+    memcpy(deviceName, devName, sizeof deviceName);
+    NULL_TERMINATE_STRING(deviceName);
+ 
+-   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup);
+    if (!dev) {
+       retval = -ENOMEM;
+       goto out;

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index e5875a7..d6cc8ea 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -94,6 +94,7 @@ src_prepare() {
 	kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
+	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2014-10-11 15:52 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2014-10-11 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     86a9b9c8758c45e519653a5652a7869cd990ffc8
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Sat Oct 11 15:48:56 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Sat Oct 11 15:48:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=86a9b9c8

compiles on 3.16.0

---
 .../files/279-3.15-00-readlink.patch               | 12 ++++++
 .../vmware-modules/files/279-3.15-01-vsock.patch   | 43 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |  3 +-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
new file mode 100644
index 0000000..36be37f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
@@ -0,0 +1,12 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2014-10-05 23:20:14.545218357 -0400
++++ vmblock-only/linux/inode.c	2014-10-05 23:33:01.549259933 -0400
+@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry,
+       return -EINVAL;
+    }
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++   return readlink_copy(buffer, buflen, iinfo->name);
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
new file mode 100644
index 0000000..a880a75
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
@@ -0,0 +1,43 @@
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notify.c	2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+    vsk = vsock_sk(sk);
+    PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notifyQState.c	2014-10-05 23:46:33.231303931 -0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+                      struct sockaddr_vm *dst,    // IN: unused
+                      struct sockaddr_vm *src)    // IN: unused
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+       }
+ 
+       /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++      sk->sk_data_ready(sk);
++#else
+       sk->sk_data_ready(sk, 0);
++#endif
+    }
+ 
+    return err;

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index 131d93a..e5875a7 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -92,7 +92,8 @@ src_prepare() {
 	
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
 	kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch"
-
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2015-05-05 16:59 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2015-05-05 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     92cecf1dbaab4333b53269e65ecbee15d9b866b0
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue May  5 16:42:05 2015 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue May  5 16:42:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92cecf1d

271 should now compile (and I beleive function correctly) on 3.19
I'll look into 4.x soon

Package-Manager: portage-2.2.18

 .../files/271-3.19-00-vmnet-warning.patch          | 13 ++++++
 .../files/271-3.19-01-vmblock-path.patch           | 52 ++++++++++++++++++++++
 .../vmware-modules/files/271-3.19-02-vmci.patch    | 29 ++++++++++++
 .../vmware-modules/files/271-3.19-03-vmnet.patch   | 29 ++++++++++++
 .../vmware-modules/files/271-3.19-04-vsock.patch   | 12 +++++
 .../vmware-modules/files/271-3.19-05-vsock.patch   | 15 +++++++
 .../vmware-modules/files/271-3.19-06-vsock.patch   | 36 +++++++++++++++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  | 10 ++++-
 8 files changed, 195 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
new file mode 100644
index 0000000..b4d30c9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
@@ -0,0 +1,13 @@
+diff -rupN vmnet-only/vm_device_version.h vmnet-only.new/vm_device_version.h
+--- vmnet-only/vm_device_version.h	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/vm_device_version.h	2015-05-05 12:03:06.879202223 -0400
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_NET                0x0720

diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
new file mode 100644
index 0000000..4bf17e1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
@@ -0,0 +1,52 @@
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c	2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c	2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+                    unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+    struct dentry *actualDentry;
+    int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c	2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,    // IN: f
+ {
+    VMBlockInodeInfo *iinfo;
+    struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+    ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h	2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
+ #endif

diff --git a/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
new file mode 100644
index 0000000..a8ec2b1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
@@ -0,0 +1,29 @@
+diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c
+--- vmci-only/linux/vmciKernelIf.c	2015-05-05 11:22:55.276071501 -0400
++++ vmci-only.new/linux/vmciKernelIf.c	2015-05-05 11:23:58.912074950 -0400
+@@ -40,6 +40,7 @@
+ #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
++#include <linux/skbuff.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c
+--- vmci-only/linux/vmciKernelIf.c	2013-11-05 23:33:26.000000000 -0500
++++ vmci-only.new/linux/vmciKernelIf.c	2015-05-05 11:21:59.929068500 -0400
+@@ -1246,11 +1246,11 @@ __VMCIMemcpyFromQueue(void *dest,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)dest;
++         struct msghdr *msg = dest;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++         err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+          if (err != 0) {
+             kunmap(kernelIf->page[pageIndex]);
+             return VMCI_ERROR_INVALID_ARGS;
+

diff --git a/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch b/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch
new file mode 100644
index 0000000..041bfb6
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch
@@ -0,0 +1,29 @@
+diff -ur vmnet-only.orig/driver.c vmnet-only/driver.c
+--- vmnet-only.orig/driver.c	2014-06-13 02:38:25.000000000 +0200
++++ vmnet-only/driver.c	2015-02-21 17:31:22.630656305 +0100
+@@ -1236,8 +1236,8 @@
+    struct inode *inode = NULL;
+    long err;
+ 
+-   if (filp && filp->f_dentry) {
+-      inode = filp->f_dentry->d_inode;
++   if (filp && filp->f_path.dentry) {
++      inode = filp->f_path.dentry->d_inode;
+    }
+    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+    return err;
+diff -ur vmnet-only.orig/userif.c vmnet-only/userif.c
+--- vmnet-only.orig/userif.c	2014-06-13 02:38:25.000000000 +0200
++++ vmnet-only/userif.c	2015-02-21 17:37:46.154589854 +0100
+@@ -523,7 +523,10 @@
+       .iov_base = buf,
+       .iov_len  = len,
+    };
+-   return skb_copy_datagram_iovec(skb, 0, &iov, len);
++   struct iov_iter to;
++
++   iov_iter_init(&to, READ, &iov, 1, len);
++   return skb_copy_datagram_iter(skb, 0, &to, len);
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch
new file mode 100644
index 0000000..8c9d3cb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch
@@ -0,0 +1,12 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);

diff --git a/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch
new file mode 100644
index 0000000..2e41230
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch
@@ -0,0 +1,15 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+    }
+ 
+    /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+    err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++   err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+    if (err) {
+       goto out;
+    }

diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
new file mode 100644
index 0000000..a2b0136
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
@@ -0,0 +1,36 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:51:59.794166063 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:53:38.621171420 -0400
+@@ -4874,9 +4874,11 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++		    struct iovec iov = iov_iter_iovec(&msg->msg_iter);
++            read = vmci_qpair_peekv(vsk->qpair, &iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++		    struct iovec iov = iov_iter_iovec(&msg->msg_iter);
++            read = vmci_qpair_dequev(vsk->qpair, &iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:53:59.937172575 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:59:25.824190240 -0400
+@@ -4628,9 +4628,12 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * size.  It is the caller's responsibility to check how many bytes we were
+        * able to send.
+        */
+-
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
+-                                  len - totalWritten, 0);
++      {
++	      struct iovec iov = iov_iter_iovec(&msg->msg_iter);
++          written = vmci_qpair_enquev(vsk->qpair, &iov,
++                                      len - totalWritten, 0);
++      }
++	  
+       if (written < 0) {
+          err = -ENOMEM;
+          goto outWait;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 96c6ccf..66c0b2b 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.3.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
 
@@ -84,6 +84,14 @@ src_prepare() {
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
 	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"
 
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-vmnet-warning.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmci.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-vmnet.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2015-05-07  1:55 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2015-05-07  1:55 UTC (permalink / raw
  To: gentoo-commits

commit:     cb645967849017b215d6a47818549c8c999a640e
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu May  7 00:56:12 2015 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu May  7 00:56:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=cb645967

trying to fix vsock's usage of VMCI interface, previous patch compiled... but was broken
as demonstrated by trying to do a VMWARE automatted install. This new patch looks better
but needs to be tested

 .../files/271-3.19-06-vmci_qpair.patch             | 24 +++++++++++++++
 .../vmware-modules/files/271-3.19-06-vsock.patch   | 36 ----------------------
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  2 +-
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
new file mode 100644
index 0000000..1849a37
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
@@ -0,0 +1,24 @@
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c     2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * able to send.
+        */
+ 
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++      written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+                                   len - totalWritten, 0);
+       if (written < 0) {
+          err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {

diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
deleted file mode 100644
index a2b0136..0000000
--- a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
---- vsock-only/linux/af_vsock.c	2015-05-05 11:51:59.794166063 -0400
-+++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:53:38.621171420 -0400
-@@ -4874,9 +4874,11 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
-          }
- 
-          if (flags & MSG_PEEK) {
--            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
-+		    struct iovec iov = iov_iter_iovec(&msg->msg_iter);
-+            read = vmci_qpair_peekv(vsk->qpair, &iov, len - copied, 0);
-          } else {
--            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
-+		    struct iovec iov = iov_iter_iovec(&msg->msg_iter);
-+            read = vmci_qpair_dequev(vsk->qpair, &iov, len - copied, 0);
-          }
- 
-          if (read < 0) {
-diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
---- vsock-only/linux/af_vsock.c	2015-05-05 11:53:59.937172575 -0400
-+++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:59:25.824190240 -0400
-@@ -4628,9 +4628,12 @@ VSockVmciStreamSendmsg(struct kiocb *kio
-        * size.  It is the caller's responsibility to check how many bytes we were
-        * able to send.
-        */
--
--      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
--                                  len - totalWritten, 0);
-+      {
-+	      struct iovec iov = iov_iter_iovec(&msg->msg_iter);
-+          written = vmci_qpair_enquev(vsk->qpair, &iov,
-+                                      len - totalWritten, 0);
-+      }
-+	  
-       if (written < 0) {
-          err = -ENOMEM;
-          goto outWait;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 66c0b2b..3158493 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-vmnet.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-vsock.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vsock.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vmci_qpair.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2015-07-11  4:21 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2015-07-11  4:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c8b1c812a25cbaa673e0fb40623d92642973c0a1
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Mon Jul  6 08:22:22 2015 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Mon Jul  6 08:22:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c8b1c812

version bump for vmware-workstation 10 and 3.19/4.0 kernel support

Package-Manager: portage-2.2.20

 .../files/279-3.18-00-version-redefined.patch      | 24 ++++++++
 .../files/279-3.19-00-compat-namei.patch           | 23 ++++++++
 .../vmware-modules/files/279-3.19-01-dentry.patch  | 13 +++++
 .../files/279-3.19-02-vmblock-path.patch           | 67 ++++++++++++++++++++++
 .../vmware-modules/files/279-3.19-03-iovec.patch   | 19 ++++++
 .../vmware-modules/files/279-3.19-04-iovec.patch   | 39 +++++++++++++
 .../files/279-3.19-05-vmci_qpair.patch             | 24 ++++++++
 .../vmware-modules/files/279-3.19-06-vsock.patch   | 15 +++++
 .../vmware-modules/files/279-3.19-07-vsock.patch   | 12 ++++
 ...es-279.5.ebuild => vmware-modules-279.6.ebuild} | 11 +++-
 .../vmware-modules/vmware-modules-304.0.ebuild     | 35 +++++------
 11 files changed, 264 insertions(+), 18 deletions(-)

diff --git a/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
new file mode 100644
index 0000000..2d38824
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
@@ -0,0 +1,24 @@
+--- a/vmci-only/shared/vm_device_version.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/shared/vm_device_version.h	2015-02-24 03:58:06.041605450 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
+--- a/vmnet-only/vm_device_version.h	2015-02-07 03:54:16.000000000 +0300
++++ c/vmnet-only/vm_device_version.h	2015-02-24 03:58:06.044604981 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE                    
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711

diff --git a/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
new file mode 100644
index 0000000..ec73500
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
@@ -0,0 +1,23 @@
+--- a/vmblock-only/shared/compat_namei.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/shared/compat_namei.h	2015-02-24 03:51:25.235286047 +0300
+@@ -21,6 +21,20 @@
+ 
+ #include <linux/namei.h>
+ 
++/* Copy-n-paste from kernel's source/fs/namei.c */
++struct nameidata {
++         struct path     path;
++         struct qstr     last;
++         struct path     root;
++         struct inode    *inode; /* path.dentry.d_inode */
++         unsigned int    flags;
++         unsigned        seq, m_seq;
++         int             last_type;
++         unsigned        depth;
++         struct file     *base;
++         char *saved_names[MAX_NESTED_LINKS + 1];
++};
++
+ /*
+  * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
+  * struct. They were both replaced with a struct path.

diff --git a/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
new file mode 100644
index 0000000..6f11a52
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
@@ -0,0 +1,13 @@
+--- a/vmnet-only/driver.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/driver.c	2015-02-24 03:58:06.043605137 +0300
+@@ -1191,8 +1191,8 @@
+    struct inode *inode = NULL;
+    long err;
+
+-   if (filp && filp->f_dentry) {
+-      inode = filp->f_dentry->d_inode;
++   if (filp && filp->f_path.dentry) {
++      inode = filp->f_path.dentry->d_inode;
+    }
+    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+    return err;

diff --git a/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
new file mode 100644
index 0000000..178d147
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c	2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c	2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+                    unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+    struct dentry *actualDentry;
+    int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c	2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,    // IN: f
+ {
+    VMBlockInodeInfo *iinfo;
+    struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+    ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h	2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
+ #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c	2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c	2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+     * and that would try to acquire the inode's semaphore; if the two inodes
+     * are the same we'll deadlock.
+     */
+-   if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++   if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+       Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+       if (filp_close(actualFile, current->files) < 0) {
+          Warning("FileOpOpen: unable to close opened file.\n");

diff --git a/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch
new file mode 100644
index 0000000..b016fec
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch
@@ -0,0 +1,19 @@
+--- a/vmnet-only/userif.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/userif.c	2015-02-24 03:58:06.043605137 +0300
+@@ -523,7 +523,15 @@
+       .iov_base = buf,
+       .iov_len  = len,
+    };
+-   return skb_copy_datagram_iovec(skb, 0, &iov, len);
++
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
++	return skb_copy_datagram_iovec(skb, 0, &iov, len);
++#else
++	struct iov_iter to;
++	iov_iter_init(&to, READ, &iov, 1, len);
++	return skb_copy_datagram_iter(skb, 0, &to, len);
++#endif
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch
new file mode 100644
index 0000000..9103c55
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch
@@ -0,0 +1,39 @@
+diff -rupN vmci-only.old/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c
+--- vmci-only.old/linux/vmciKernelIf.c	2015-04-28 18:05:56.000000000 +0000
++++ vmci-only/linux/vmciKernelIf.c	2015-07-06 08:02:08.314262258 +0000
+@@ -40,6 +40,7 @@
+ #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
++#include <linux/skbuff.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+@@ -1227,11 +1228,11 @@ __VMCIMemcpyToQueue(VMCIQueue *queue,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)src;
++         struct msghdr *msg = (struct msghdr *)src;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
++         err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
+          if (err != 0) {
+             if (!kernelIf->isDataMapped) {
+                kunmap(kernelIf->page[pageIndex]);
+@@ -1302,11 +1303,11 @@ __VMCIMemcpyFromQueue(void *dest,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)dest;
++         struct msghdr *msg = (struct msghdr *)dest;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++         err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+          if (err != 0) {
+             if (!kernelIf->isDataMapped) {
+                kunmap(kernelIf->page[pageIndex]);

diff --git a/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch
new file mode 100644
index 0000000..1849a37
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch
@@ -0,0 +1,24 @@
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c     2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * able to send.
+        */
+ 
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++      written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+                                   len - totalWritten, 0);
+       if (written < 0) {
+          err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {

diff --git a/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch
new file mode 100644
index 0000000..2e41230
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch
@@ -0,0 +1,15 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+    }
+ 
+    /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+    err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++   err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+    if (err) {
+       goto out;
+    }

diff --git a/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch
new file mode 100644
index 0000000..8c9d3cb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch
@@ -0,0 +1,12 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);

diff --git a/app-emulation/vmware-modules/vmware-modules-279.5.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
similarity index 80%
rename from app-emulation/vmware-modules/vmware-modules-279.5.ebuild
rename to app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 8ec991a..64a7d8a 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.5.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: Exp $
 
@@ -89,6 +89,15 @@ src_prepare() {
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
 	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
index 8be7242..e817e97 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
@@ -21,7 +21,8 @@ IUSE="pax_kernel +vmci +vsock"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
+	|| ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
+	=app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
 
 S=${WORKDIR}
 
@@ -78,22 +79,22 @@ src_prepare() {
 	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/304-3.10-00-dentry.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/304-3.10-01-inode.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/304-3.10-02-control.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/304-3.10-03-inline.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/304-3.11-00-readdir.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/304-3.11-01-filldir.patch"
-	kernel_is ge 3 15 0 && epatch "${FILESDIR}/304-3.15-00-vsock.patch"
-	kernel_is ge 3 18 0 && epatch "${FILESDIR}/304-3.18-00-version-redefined.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-00-compat-namei.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-01-dentry.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-02-vmblock-path.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-03-iovec.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-04-iovec.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-05-vmci_qpair.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-06-vsock.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/304-3.19-07-vsock.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2015-09-19 19:08 Andreas Hüttel
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Hüttel @ 2015-09-19 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f450eae9e2390e8a2372d0c9e166c5b1438f2513
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 19:08:41 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 19:08:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f450eae9

app-emulation/vmware-modules: Add patch for Kernel 4.2, bug 559602

Package-Manager: portage-2.2.20.1

 .../vmware-modules/files/279-4.2-00-cookie.patch   | 79 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-279.6.ebuild     |  1 +
 2 files changed, 80 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch
new file mode 100644
index 0000000..e2ab8a1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch
@@ -0,0 +1,79 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=559602
+Patch by Mike Auty <ikelos@gentoo.org>
+
+diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
+index 4811abd..2cbc1f6 100644
+--- a/vmblock-only/linux/inode.c
++++ b/vmblock-only/linux/inode.c
+@@ -38,7 +38,9 @@
+ static struct dentry *InodeOpLookup(struct inode *dir,
+                                     struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); 
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+ static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -207,7 +209,12 @@ static void *
+ static int
+ #endif
+ InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+-                  struct nameidata *nd)   // OUT: stores result
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++		  void **cookie
++#else
++		  struct nameidata *nd
++#endif
++		  )   // OUT: stores result
+ {
+    int ret;
+    VMBlockInodeInfo *iinfo;
+diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
+index acb2803..4811abd 100644
+--- a/vmblock-only/linux/inode.c
++++ b/vmblock-only/linux/inode.c
+@@ -199,7 +199,9 @@ InodeOpReadlink(struct dentry *dentry,  // IN : dentry of symlink
+  *----------------------------------------------------------------------------
+  */
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *
+ #else
+ static int
+@@ -222,8 +224,12 @@ InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++   return *cookie = (char *)(iinfo->name);
++#else
+    nd_set_link(nd, iinfo->name);
+    ret = 0;
++#endif
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+diff --git a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h
+index 23b5d19..d129f7b 100644
+--- a/vmnet-only/vmnetInt.h
++++ b/vmnet-only/vmnetInt.h
+@@ -78,8 +78,13 @@
+ 
+ extern struct proto vmnet_proto;
+ #ifdef VMW_NETDEV_HAS_NET
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)  
+ #   define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
+-                                                PF_NETLINK, _pri, &vmnet_proto)
++						PF_NETLINK, _pri, &vmnet_proto, 1)
++# else
++#   define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
++						PF_NETLINK, _pri, &vmnet_proto)
++# endif
+ #else
+ #   define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)
+ #endif

diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 4a78931..f10f4ee 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -98,6 +98,7 @@ src_prepare() {
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+	kernel_is ge 4 2 0  && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-cookie.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2016-03-17  2:26 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2016-03-17  2:26 UTC (permalink / raw
  To: gentoo-commits

commit:     11f4e961c166dba8df17de09a97b6826a41f28c6
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu Mar 17 02:26:30 2016 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Mar 17 02:26:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=11f4e961

app-emulation/vmware-modules: compiles on 4.5 kernels now

Package-Manager: portage-2.2.26

 .../vmware-modules/files/304-4.5-00-get_link.patch | 67 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  |  1 +
 2 files changed, 68 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
new file mode 100644
index 0000000..169fc71
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
@@ -0,0 +1,67 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
+--- vmblock-only/linux/inode.c	2016-03-16 22:22:00.470080630 -0400
++++ vmblock-only.new/linux/inode.c	2016-03-16 22:23:33.016081859 -0400
+@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
+ static int InodeOpReadlink(struct dentry *, char __user *, int);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+ static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -63,7 +65,11 @@ static struct inode_operations LinkInode
+ struct inode_operations LinkInodeOps = {
+ #endif
+    .readlink    = InodeOpReadlink,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   .get_link = InodeOpGetLink,
++#else
+    .follow_link = InodeOpFollowlink,
++#endif
+ };
+ 
+ /*
+@@ -222,7 +228,9 @@ InodeOpReadlink(struct dentry *dentry,
+  *
+  *----------------------------------------------------------------------------
+  */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+ static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
+ #else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+@@ -238,18 +246,28 @@ InodeOpFollowlink(struct dentry *dentry,
+    VMBlockInodeInfo *iinfo;
+ 
+    if (!dentry) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++      ret = -ECHILD;
++#else
+       Warning("InodeOpReadlink: invalid args from kernel\n");
+       ret = -EINVAL;
++#endif
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   iinfo = INODE_TO_IINFO(inode);
++#else
+    iinfo = INODE_TO_IINFO(dentry->d_inode);
++#endif
+    if (!iinfo) {
+       ret = -EINVAL;
+       goto out;
+    }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   return (char *)(iinfo->name);  
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+    return *cookie = (char *)(iinfo->name);  
+ #else
+    nd_set_link(nd, iinfo->name);

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 766eb32..86bea59 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -100,6 +100,7 @@ src_prepare() {
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
+	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2016-05-19 18:18 Fabio Rossi
  0 siblings, 0 replies; 24+ messages in thread
From: Fabio Rossi @ 2016-05-19 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     10131c0123b70c9731716d8e2b1acd37040cbf64
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Thu May 19 17:52:06 2016 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Thu May 19 17:52:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=10131c01

app-emulation/vmware-modules: add support to kernel 4.6

This closes https://github.com/gentoo/vmware/pull/23 and bug #583244

 .../files/304-4.6-00-user-pages.patch              | 84 ++++++++++++++++++++++
 .../files/308-4.06-00-user-pages.patch             | 84 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  |  1 +
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  1 +
 4 files changed, 170 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
new file mode 100644
index 0000000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old	2016-05-19 19:00:09.784669042 +0200
++++ ./vmci-only/linux/driver.c	2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+                            1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old	2016-05-19 18:57:04.344658673 +0200
++++ ./vmci-only/linux/vmciKernelIf.c	2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+       if (dirty) {
+          set_page_dirty(pages[i]);
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++      put_page(pages[i]);
++#else
+       page_cache_release(pages[i]);
++#endif
+       pages[i] = NULL;
+    }
+ }
+@@ -2049,9 +2053,13 @@
+    int err = VMCI_SUCCESS;
+ 
+    down_write(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)produceUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)produceUVA,
++#endif
+                            produceQ->kernelIf->numPages,
+                            1, 0,
+                            produceQ->kernelIf->u.h.headerPage,
+@@ -2063,9 +2071,13 @@
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)consumeUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)consumeUVA,
++#endif
+                            consumeQ->kernelIf->numPages,
+                            1, 0,
+                            consumeQ->kernelIf->u.h.headerPage,
+--- ./vmmon-only/linux/hostif.c.old	2016-05-19 18:50:42.872637343 +0200
++++ ./vmmon-only/linux/hostif.c	2016-05-19 18:53:40.208647259 +0200
+@@ -1163,7 +1163,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((unsigned long)uvAddr,
++#else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
++#endif
+                            numPages, 0, 0, ppages, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmnet-only/userif.c.old	2016-05-19 18:52:45.904644222 +0200
++++ ./vmnet-only/userif.c	2016-05-19 18:53:28.599646610 +0200
+@@ -113,7 +113,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+ 			   1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 

diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
new file mode 100644
index 0000000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old	2016-05-19 19:00:09.784669042 +0200
++++ ./vmci-only/linux/driver.c	2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+                            1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old	2016-05-19 18:57:04.344658673 +0200
++++ ./vmci-only/linux/vmciKernelIf.c	2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+       if (dirty) {
+          set_page_dirty(pages[i]);
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++      put_page(pages[i]);
++#else
+       page_cache_release(pages[i]);
++#endif
+       pages[i] = NULL;
+    }
+ }
+@@ -2049,9 +2053,13 @@
+    int err = VMCI_SUCCESS;
+ 
+    down_write(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)produceUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)produceUVA,
++#endif
+                            produceQ->kernelIf->numPages,
+                            1, 0,
+                            produceQ->kernelIf->u.h.headerPage,
+@@ -2063,9 +2071,13 @@
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)consumeUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)consumeUVA,
++#endif
+                            consumeQ->kernelIf->numPages,
+                            1, 0,
+                            consumeQ->kernelIf->u.h.headerPage,
+--- ./vmmon-only/linux/hostif.c.old	2016-05-19 18:50:42.872637343 +0200
++++ ./vmmon-only/linux/hostif.c	2016-05-19 18:53:40.208647259 +0200
+@@ -1163,7 +1163,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((unsigned long)uvAddr,
++#else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
++#endif
+                            numPages, 0, 0, ppages, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmnet-only/userif.c.old	2016-05-19 18:52:45.904644222 +0200
++++ ./vmnet-only/userif.c	2016-05-19 18:53:28.599646610 +0200
+@@ -113,7 +113,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+ 			   1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 86bea59..c56f4de 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -101,6 +101,7 @@ src_prepare() {
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index 0412eca..a7e1daa 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -101,6 +101,7 @@ src_prepare() {
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2016-08-17 12:38 Fabio Rossi
  0 siblings, 0 replies; 24+ messages in thread
From: Fabio Rossi @ 2016-08-17 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f5e136467b79ef82f237004c60f5bc8dd4e486ef
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Wed Aug 17 12:08:10 2016 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Wed Aug 17 12:08:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f5e13646

app-emulation/vmware-modules: add support to kernel 4.8

upstream kernel commit 4b9d0fab7166c9323f06d708518a35cf3a90426c renamed
a symbol, add a patch to fix the problem. This solves the bug #591284.

 .../vmware-modules/files/304-4.8-00-nr_anon_mapped.patch   | 14 ++++++++++++++
 .../vmware-modules/files/308-4.08-00-nr_anon_mapped.patch  | 14 ++++++++++++++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild          |  1 +
 app-emulation/vmware-modules/vmware-modules-304.4.ebuild   |  1 +
 app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild |  1 +
 5 files changed, 31 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch
new file mode 100644
index 0000000..f806ccd
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch
@@ -0,0 +1,14 @@
+diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- a/vmmon-only/linux/hostif.c	2016-08-13 16:54:18.935207507 +0300
++++ b/vmmon-only/linux/hostif.c	2016-08-13 16:53:52.981424256 +0300
+@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
+  */
+ #define LOCKED_PAGE_SLACK 10000
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
++#define NR_ANON_PAGES NR_ANON_MAPPED
++#endif
++
+ static struct {
+    Atomic_uint64     uptimeBase;
+    VersionedAtomic   version;

diff --git a/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
new file mode 100644
index 0000000..f806ccd
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
@@ -0,0 +1,14 @@
+diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- a/vmmon-only/linux/hostif.c	2016-08-13 16:54:18.935207507 +0300
++++ b/vmmon-only/linux/hostif.c	2016-08-13 16:53:52.981424256 +0300
+@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
+  */
+ #define LOCKED_PAGE_SLACK 10000
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
++#define NR_ANON_PAGES NR_ANON_MAPPED
++#endif
++
+ static struct {
+    Atomic_uint64     uptimeBase;
+    VersionedAtomic   version;

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index ba97b17..a10a9f4 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
+	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
index ba97b17..a10a9f4 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
+	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index da4a7a1..b3faaaf 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
+	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2016-12-12 21:19 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2016-12-12 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     44fda826a47e67573d69290ea616e6da210e9849
Author:     Joshua Baergen <joshua.baergen <AT> emc <DOT> com>
AuthorDate: Mon Dec 12 18:11:23 2016 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Mon Dec 12 18:19:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=44fda826

app-emulation/vmware-modules: add support for kernel 4.9

4.9 introduced a change to the get_user_pages() API:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=768ae309a96103ed02eb1e111e838c87854d8b51

 .../files/308-4.09-00-user-pages.patch             | 77 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  1 +
 2 files changed, 78 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch
new file mode 100644
index 0000000..73c6c9f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch
@@ -0,0 +1,77 @@
+--- vmmon-only/linux/hostif.c	2016-12-12 09:17:44.438182532 -0700
++++ vmmon-only/linux/hostif.c	2016-12-12 09:19:24.066254301 -0700
+@@ -1172,7 +1172,11 @@
+ #else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
+ #endif
+-                           numPages, 0, 0, ppages, NULL);
++                           numPages, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++                           0,
++#endif
++			   ppages, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+    return retval != numPages;
+--- vmnet-only/userif.c     2016-12-12 09:27:12.445246854 -0700
++++ vmnet-only/userif.c 2016-12-12 09:27:30.654298646 -0700
+@@ -118,7 +118,13 @@
+ #else
+    retval = get_user_pages(current, current->mm, addr,
+ #endif
+-			   1, 1, 0, &page, NULL);
++                          1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++                          1, 0,
++#else
++                          FOLL_WRITE,
++#endif
++                          &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+    if (retval != 1) {
+--- vmci-only/linux/driver.c        2016-12-12 09:38:13.076847013 -0700
++++ vmci-only/linux/driver.c    2016-12-12 09:38:45.638087445 -0700
+@@ -1473,7 +1473,13 @@
+ #else
+    retval = get_user_pages(current, current->mm, addr,
+ #endif
+-                           1, 1, 0, &page, NULL);
++                          1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++                          1, 0,
++#else
++                          FOLL_WRITE,
++#endif
++                          &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+    if (retval != 1) {
+--- vmci-only/linux/vmciKernelIf.c  2016-12-12 09:38:20.678904322 -0700
++++ vmci-only/linux/vmciKernelIf.c      2016-12-12 09:39:59.129587451 -0700
+@@ -2061,7 +2061,11 @@
+                            (VA)produceUVA,
+ #endif
+                            produceQ->kernelIf->numPages,
+-                           1, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++                          1, 0,
++#else
++                          FOLL_WRITE,
++#endif
+                            produceQ->kernelIf->u.h.headerPage,
+                            NULL);
+    if (retval < produceQ->kernelIf->numPages) {
+@@ -2079,7 +2083,11 @@
+                            (VA)consumeUVA,
+ #endif
+                            consumeQ->kernelIf->numPages,
+-                           1, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++                          1, 0,
++#else
++                          FOLL_WRITE,
++#endif
+                            consumeQ->kernelIf->u.h.headerPage,
+                            NULL);
+    if (retval < consumeQ->kernelIf->numPages) {

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index b3faaaf..bb9db4f 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -105,6 +105,7 @@ src_prepare() {
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
 	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
 	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
+	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2017-04-05 14:49 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2017-04-05 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     21f2f9477ccb35e04fefed3c0bc3d4c724ab0255
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Wed Apr  5 14:49:40 2017 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Wed Apr  5 14:49:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=21f2f947

adding support for 4.9 kernels to vmware-modules 304 (workstation 11)

 .../files/304-4.9-00-get_user_pages.patch          |  20 ++++
 .../files/304-4.9-01-get_user_pages.patch          |  20 ++++
 .../vmware-modules/vmware-modules-304.4-r1.ebuild  | 125 +++++++++++++++++++++
 3 files changed, 165 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch
new file mode 100644
index 0000000..9b7e0a4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch
@@ -0,0 +1,20 @@
+--- vmmon-only.bak/linux/hostif.c       2017-04-05 10:10:24.522070886 -0400
++++ vmmon-only/linux/hostif.c   2017-04-05 10:13:35.871077701 -0400
+@@ -1171,12 +1171,16 @@ HostIFGetUserPages(void *uvAddr,
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++       retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, NULL);
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
+    retval = get_user_pages((unsigned long)uvAddr,
+ #else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
+ #endif
+                            numPages, 0, 0, ppages, NULL);
++#endif
+    up_read(&current->mm->mmap_sem);
+ 
+    return retval != numPages;
+

diff --git a/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch
new file mode 100644
index 0000000..0858beb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch
@@ -0,0 +1,20 @@
+diff -rupN vmnet-only.bak/userif.c vmnet-only/userif.c
+--- vmnet-only.bak/userif.c	2017-04-05 10:44:29.166143701 -0400
++++ vmnet-only/userif.c	2017-04-05 10:45:46.443146453 -0400
+@@ -113,12 +113,16 @@ UserifLockPage(VA addr) // IN
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++   retval = get_user_pages(addr, 1, FOLL_WRITE, &page, NULL);
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
+    retval = get_user_pages(addr,
+ #else
+    retval = get_user_pages(current, current->mm, addr,
+ #endif
+ 			   1, 1, 0, &page, NULL);
++#endif
+    up_read(&current->mm->mmap_sem);
+ 
+    if (retval != 1) {

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
new file mode 100644
index 0000000..d50aedc
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="pax_kernel +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
+	=app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST_ALL}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
+	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
+	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
+	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
+	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.9-00-get_user_pages.patch"
+	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.9-01-get_user_pages.patch"
+	
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmmon", GROUP="vmware", MODE="660"
+		KERNEL=="vsock", GROUP="vmware", MODE="660"
+	EOF
+	udev_dorules "${udevrules}"
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2017-05-23 23:26 Fabio Rossi
  0 siblings, 0 replies; 24+ messages in thread
From: Fabio Rossi @ 2017-05-23 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0326b3e5c8bd3163cd658cc99b865251756bfec2
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Tue May 23 23:08:30 2017 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Tue May 23 23:08:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0326b3e5

app-emulation/vmware-modules: add support to kernel 4.11

 .../files/308-4.11-00-missing-headers-p1.patch     | 40 ++++++++++++++++++++++
 .../files/308-4.11-00-missing-headers-p2.patch     | 20 +++++++++++
 .../files/308-4.11-01-vsock-lockdep.patch          | 21 ++++++++++++
 .../vmware-modules/files/308-4.11-02-vmmon.patch   | 30 ++++++++++++++++
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  4 +++
 .../vmware-modules/vmware-modules-308.5.6.ebuild   |  2 ++
 6 files changed, 117 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch
new file mode 100644
index 0000000..60fcdfc
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch
@@ -0,0 +1,40 @@
+--- vmblock-only/linux/inode.c	2017-05-06 16:54:57.000000000 +0200
++++ vmblock-only/linux/inode.c.new	2017-05-06 16:55:32.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <linux/fs.h>
+ #include <linux/time.h>
+ #include <linux/namei.h>
++#include <linux/cred.h>
+ 
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+--- vmci-only/linux/driver.c	2017-05-06 16:59:06.000000000 +0200
++++ vmci-only/linux/driver.c.new	2017-05-06 17:00:03.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include <linux/poll.h>
+ #include <linux/smp.h>
+ #include <linux/vmalloc.h>
++#include <linux/cred.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vmci-only/linux/vmciKernelIf.c	2017-05-06 17:00:42.000000000 +0200
++++ vmci-only/linux/vmciKernelIf.c.new	2017-05-06 17:01:24.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
+ #include <linux/skbuff.h>
++#include <linux/sched/signal.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vsock-only/linux/af_vsock.c	2017-05-06 17:02:05.000000000 +0200
++++ vsock-only/linux/af_vsock.c.new	2017-05-06 17:02:49.000000000 +0200
+@@ -106,6 +106,7 @@
+ #include <linux/list.h>
+ #include <linux/wait.h>
+ #include <linux/init.h>
++#include <linux/sched/signal.h>
+ #include <asm/io.h>
+ #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
+ #   include <linux/ioctl32.h>

diff --git a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
new file mode 100644
index 0000000..29a0c9d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/hostif.c	2017-05-06 16:56:09.000000000 +0200
++++ vmmon-only/linux/hostif.c.new	2017-05-06 16:56:41.000000000 +0200
+@@ -73,6 +73,7 @@
+ #include <linux/capability.h>
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <asm/apic.h>
+ 
+--- vmnet-only/userif.c	2017-03-13 04:05:59.000000000 +0100
++++ vmnet-only/userif.c.new	2017-05-06 16:58:32.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <linux/slab.h>
+ #include <linux/version.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <net/checksum.h>
+ #include <net/sock.h>

diff --git a/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch
new file mode 100644
index 0000000..7218d27
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch
@@ -0,0 +1,21 @@
+--- vsock-only/linux/af_vsock.c	2017-05-21 00:58:02.900776185 +0200
++++ vsock-only/linux/af_vsock.c.new	2017-05-21 00:57:18.932773727 +0200
+@@ -213,7 +213,7 @@
+                                  struct sockaddr *addr, int addrLen, int flags);
+ static int VSockVmciStreamConnect(struct socket *sock,
+                                   struct sockaddr *addr, int addrLen, int flags);
+-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags);
++static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags, bool kern);
+ static int VSockVmciGetname(struct socket *sock,
+                             struct sockaddr *addr, int *addrLen, int peer);
+ static unsigned int VSockVmciPoll(struct file *file,
+@@ -3772,7 +3772,8 @@
+ static int
+ VSockVmciAccept(struct socket *sock,     // IN
+                 struct socket *newsock,  // IN/OUT
+-                int flags)               // IN
++                int flags,               // IN
++                bool kern)               // IN
+ {
+    struct sock *listener;
+    int err;

diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
new file mode 100644
index 0000000..b126453
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
@@ -0,0 +1,30 @@
+diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
+--- old/vmmon-only/linux/driver.c     2016-11-12 09:15:52.000000000 +0200
++++ vmmon-only/linux/driver.c      2017-03-06 10:46:33.347053458 +0200
+@@ -105,7 +105,7 @@
+ static int LinuxDriver_Close(struct inode *inode, struct file *filp);
+ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
+ #if defined(VMW_NOPAGE_2624)
+-static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
++static int LinuxDriverFault(struct vm_fault *fault);
+ #else
+ static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
+                                       unsigned long address,
+@@ -882,15 +882,14 @@
+  */
+
+ #if defined(VMW_NOPAGE_2624)
+-static int LinuxDriverFault(struct vm_area_struct *vma, //IN
+-                            struct vm_fault *fault)     //IN/OUT
++static int LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
+ #else
+ static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
+                                       unsigned long address,      //IN
+                                       int *type)                  //OUT: Fault type
+ #endif
+ {
+-   VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
++   VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
+    unsigned long pg;
+    struct page* page;
+

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index 51eaa63..86ee488 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -109,6 +109,10 @@ src_prepare() {
 	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
 	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p2.patch"
 	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
index 4fcb06c..92fc364 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
@@ -106,6 +106,8 @@ src_prepare() {
 	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
 	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
 	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2017-05-23 23:26 Fabio Rossi
  0 siblings, 0 replies; 24+ messages in thread
From: Fabio Rossi @ 2017-05-23 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     9a41d0c3db28fb44493720e49e81384943611b0d
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Tue May 23 23:10:54 2017 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Tue May 23 23:10:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=9a41d0c3

Fix support to kernel 4.9 and add 4.10 and 4.11 for old =vmware-modules-304

 .../files/304-4.10-00-generic_readlink.patch       | 14 ++++++++
 .../files/304-4.11-00-missing-headers-p1.patch     | 40 ++++++++++++++++++++++
 .../files/304-4.11-00-missing-headers-p2.patch     | 20 +++++++++++
 .../files/304-4.11-01-vsock-lockdep.patch          | 21 ++++++++++++
 .../vmware-modules/files/304-4.11-02-vmmon.patch   | 30 ++++++++++++++++
 .../files/304-4.9-02-get_user_pages.patch          | 40 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-304.4-r1.ebuild  |  8 ++++-
 7 files changed, 172 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch b/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch
new file mode 100644
index 0000000..ab22a75
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch
@@ -0,0 +1,14 @@
+--- vmblock-only/linux/inode.c	2017-02-21 08:38:50.844678686 -0700
++++ vmblock-only/linux/inode.c	2017-02-21 08:59:40.557917497 -0700
+@@ -207,8 +207,10 @@
+ 	return vfs_readlink(dentry, buffer, buflen, iinfo->name);
+ #elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
+     return readlink_copy(buffer, buflen, iinfo->name);
+-#else
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 9, 99)
+     return generic_readlink(dentry, buffer, buflen);
++#else
++    return vfs_readlink(dentry, buffer, buflen);
+ #endif
+ }
+ 

diff --git a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
new file mode 100644
index 0000000..215bcf3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
@@ -0,0 +1,40 @@
+--- vmblock-only/linux/inode.c	2017-05-06 16:54:57.000000000 +0200
++++ vmblock-only/linux/inode.c.new	2017-05-06 16:55:32.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <linux/fs.h>
+ #include <linux/time.h>
+ #include <linux/namei.h>
++#include <linux/cred.h>
+ 
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+--- vmci-only/linux/driver.c	2017-05-06 16:59:06.000000000 +0200
++++ vmci-only/linux/driver.c.new	2017-05-06 17:00:03.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/poll.h>
+ #include <linux/smp.h>
++#include <linux/cred.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vmci-only/linux/vmciKernelIf.c	2017-05-06 17:00:42.000000000 +0200
++++ vmci-only/linux/vmciKernelIf.c.new	2017-05-06 17:01:24.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
+ #include <linux/skbuff.h>
++#include <linux/sched/signal.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vsock-only/linux/af_vsock.c	2017-05-06 17:02:05.000000000 +0200
++++ vsock-only/linux/af_vsock.c.new	2017-05-06 17:02:49.000000000 +0200
+@@ -106,6 +106,7 @@
+ #include <linux/list.h>
+ #include <linux/wait.h>
+ #include <linux/init.h>
++#include <linux/sched/signal.h>
+ #include <asm/io.h>
+ #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
+ #   include <linux/ioctl32.h>

diff --git a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
new file mode 100644
index 0000000..29a0c9d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/hostif.c	2017-05-06 16:56:09.000000000 +0200
++++ vmmon-only/linux/hostif.c.new	2017-05-06 16:56:41.000000000 +0200
+@@ -73,6 +73,7 @@
+ #include <linux/capability.h>
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <asm/apic.h>
+ 
+--- vmnet-only/userif.c	2017-03-13 04:05:59.000000000 +0100
++++ vmnet-only/userif.c.new	2017-05-06 16:58:32.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <linux/slab.h>
+ #include <linux/version.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <net/checksum.h>
+ #include <net/sock.h>

diff --git a/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch b/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch
new file mode 100644
index 0000000..7218d27
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch
@@ -0,0 +1,21 @@
+--- vsock-only/linux/af_vsock.c	2017-05-21 00:58:02.900776185 +0200
++++ vsock-only/linux/af_vsock.c.new	2017-05-21 00:57:18.932773727 +0200
+@@ -213,7 +213,7 @@
+                                  struct sockaddr *addr, int addrLen, int flags);
+ static int VSockVmciStreamConnect(struct socket *sock,
+                                   struct sockaddr *addr, int addrLen, int flags);
+-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags);
++static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags, bool kern);
+ static int VSockVmciGetname(struct socket *sock,
+                             struct sockaddr *addr, int *addrLen, int peer);
+ static unsigned int VSockVmciPoll(struct file *file,
+@@ -3772,7 +3772,8 @@
+ static int
+ VSockVmciAccept(struct socket *sock,     // IN
+                 struct socket *newsock,  // IN/OUT
+-                int flags)               // IN
++                int flags,               // IN
++                bool kern)               // IN
+ {
+    struct sock *listener;
+    int err;

diff --git a/app-emulation/vmware-modules/files/304-4.11-02-vmmon.patch b/app-emulation/vmware-modules/files/304-4.11-02-vmmon.patch
new file mode 100644
index 0000000..b126453
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-02-vmmon.patch
@@ -0,0 +1,30 @@
+diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
+--- old/vmmon-only/linux/driver.c     2016-11-12 09:15:52.000000000 +0200
++++ vmmon-only/linux/driver.c      2017-03-06 10:46:33.347053458 +0200
+@@ -105,7 +105,7 @@
+ static int LinuxDriver_Close(struct inode *inode, struct file *filp);
+ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
+ #if defined(VMW_NOPAGE_2624)
+-static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
++static int LinuxDriverFault(struct vm_fault *fault);
+ #else
+ static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
+                                       unsigned long address,
+@@ -882,15 +882,14 @@
+  */
+
+ #if defined(VMW_NOPAGE_2624)
+-static int LinuxDriverFault(struct vm_area_struct *vma, //IN
+-                            struct vm_fault *fault)     //IN/OUT
++static int LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
+ #else
+ static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
+                                       unsigned long address,      //IN
+                                       int *type)                  //OUT: Fault type
+ #endif
+ {
+-   VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
++   VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
+    unsigned long pg;
+    struct page* page;
+

diff --git a/app-emulation/vmware-modules/files/304-4.9-02-get_user_pages.patch b/app-emulation/vmware-modules/files/304-4.9-02-get_user_pages.patch
new file mode 100644
index 0000000..1b8b87f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.9-02-get_user_pages.patch
@@ -0,0 +1,40 @@
+--- vmci-only/linux/driver.c.old	2017-05-24 01:02:34.453636688 +0200
++++ vmci-only/linux/driver.c	2017-05-24 01:04:12.757631983 +0200
+@@ -1476,7 +1476,11 @@
+ #else
+    retval = get_user_pages(current, current->mm, addr,
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++                           1, FOLL_WRITE, &page, NULL);
++#else
+                            1, 1, 0, &page, NULL);
++#endif
+    up_read(&current->mm->mmap_sem);
+ 
+    if (retval != 1) {
+--- vmci-only/linux/vmciKernelIf.c.old	2017-05-24 00:58:58.837647006 +0200
++++ vmci-only/linux/vmciKernelIf.c	2017-05-24 01:02:07.668637969 +0200
+@@ -2062,7 +2062,11 @@
+                            (VA)produceUVA,
+ #endif
+                            produceQ->kernelIf->numPages,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++                           FOLL_WRITE,
++#else
+                            1, 0,
++#endif
+                            produceQ->kernelIf->u.h.headerPage,
+                            NULL);
+    if (retval < produceQ->kernelIf->numPages) {
+@@ -2080,7 +2084,11 @@
+                            (VA)consumeUVA,
+ #endif
+                            consumeQ->kernelIf->numPages,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++                           FOLL_WRITE,
++#else
+                            1, 0,
++#endif
+                            consumeQ->kernelIf->u.h.headerPage,
+                            NULL);
+    if (retval < consumeQ->kernelIf->numPages) {

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
index d50aedc..8bf050e 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
@@ -107,7 +107,13 @@ src_prepare() {
 	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
 	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.9-00-get_user_pages.patch"
 	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.9-01-get_user_pages.patch"
-	
+	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.9-02-get_user_pages.patch"
+	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
+	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch"
+
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2017-08-21 17:07 Evan Teran
  0 siblings, 0 replies; 24+ messages in thread
From: Evan Teran @ 2017-08-21 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f0d2d07f7592531eab46fb5b86d58b29bf206d0b
Author:     Joshua Baergen <joshua.baergen <AT> emc <DOT> com>
AuthorDate: Thu Jul  6 18:23:43 2017 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Jul  6 18:23:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f0d2d07f

app-emulation/vmware-modules: add support to kernel 4.12

 .../files/308-4.12-00-vmblock-current_time.patch       | 11 +++++++++++
 .../files/308-4.12-01-vmci-do_once.patch               | 18 ++++++++++++++++++
 .../files/308-4.12-02-vmci-pci_enable_msix.patch       | 17 +++++++++++++++++
 .../vmware-modules/vmware-modules-308.5.7.ebuild       |  3 +++
 4 files changed, 49 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch
new file mode 100644
index 0000000..f39b862
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch
@@ -0,0 +1,11 @@
+--- ./vmblock-only/linux/inode.c	2017-07-06 11:47:09.496190133 -0600
++++ ./vmblock-only/linux/inode.c.new	2017-07-06 11:55:53.212410091 -0600
+@@ -156,7 +156,7 @@
+    inode->i_mode = S_IFLNK | S_IRWXUGO;
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+-   inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
++   inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+    inode->i_uid = inode->i_gid = 0;
+ #else

diff --git a/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch
new file mode 100644
index 0000000..e91f047
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch
@@ -0,0 +1,18 @@
+--- vmci-only/shared/vm_basic_defs.h	2017-06-19 20:29:40.000000000 -0600
++++ vmci-only/shared/vm_basic_defs.h.new	2017-07-06 12:11:37.146017203 -0600
+@@ -720,6 +720,7 @@
+                                                      lfMessageFont)
+ 
+ /* This is not intended to be thread-safe. */
++#ifndef DO_ONCE
+ #define DO_ONCE(code)                                                   \
+    do {                                                                 \
+       static Bool _doOnceDone = FALSE;                                  \
+@@ -728,6 +729,7 @@
+          code;                                                          \
+       }                                                                 \
+    } while (0)
++#endif
+ 
+ /*
+  * Bug 827422 and 838523.

diff --git a/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch
new file mode 100644
index 0000000..a4ce13a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch
@@ -0,0 +1,17 @@
+--- ./vmci-only/linux/driver.c	2017-07-06 12:12:38.860458601 -0600
++++ ./vmci-only/linux/driver.c.new	2017-07-06 12:21:09.986139888 -0600
+@@ -1726,11 +1726,11 @@
+       vmci_dev.msix_entries[i].vector = i;
+    }
+ 
+-   result = pci_enable_msix(pdev, vmci_dev.msix_entries, VMCI_MAX_INTRS);
++   result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, VMCI_MAX_INTRS);
+    if (!result) {
+       vmci_dev.exclusive_vectors = TRUE;
+-   } else if (result > 0) {
+-      result = pci_enable_msix(pdev, vmci_dev.msix_entries, 1);
++   } else {
++      result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, 1);
+    }
+    return result;
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index 351dec4..ad6b45c 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -107,6 +107,9 @@ src_prepare() {
 	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
 	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"
 	kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
+	kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-00-vmblock-current_time.patch"
+	kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-01-vmci-do_once.patch"
+	kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
@ 2018-04-07 15:00 Fabio Rossi
  0 siblings, 0 replies; 24+ messages in thread
From: Fabio Rossi @ 2018-04-07 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     78376a3171e9d29c9d132929159d22628fe86776
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Tue Feb 20 16:43:04 2018 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Tue Feb 20 16:43:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=78376a31

app-emulation/vmware-modules: add support to kernel 4.16-rc2

The changes are due to kernel commit ae5e165d855dd978a461b22175531b07f54fb61f,
there is a new API to access inode->i_version

 .../files/308-4.16-00-vmblock-iversion.patch       | 25 ++++++++++++++++++++++
 .../vmware-modules/vmware-modules-308.5.8.ebuild   |  1 +
 2 files changed, 26 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
new file mode 100644
index 0000000..42efdb9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
@@ -0,0 +1,25 @@
+--- ./vmblock-only/linux/inode.c	2018-02-20 16:33:44.296417858 +0100
++++ ./vmblock-only/linux/inode.c.new	2018-02-20 17:33:24.525618051 +0100
+@@ -30,6 +30,10 @@
+ #include <linux/namei.h>
+ #include <linux/cred.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
++#include <linux/iversion.h>
++#endif
++
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+ #include "block.h"
+@@ -155,7 +159,11 @@
+ 
+    inode->i_mode = S_IFLNK | S_IRWXUGO;
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
++   inode_set_iversion(inode, 1);
++#else
+    inode->i_version = 1;
++#endif
+    inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+    inode->i_uid = inode->i_gid = 0;

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
index e6f2999..17264ed 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
@@ -115,6 +115,7 @@ src_prepare() {
 	kernel_is ge 4 14 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.14-00-vmmon-global-page-state.patch"
 	kernel_is ge 4 14 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.14-01-deprecated-asm-uaccess.patch"
 	kernel_is ge 4 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.15-00-init_timer.patch"
+	kernel_is ge 4 16 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.16-00-vmblock-iversion.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2018-04-07 15:00 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-19 19:08 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/ Andreas Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2018-04-07 15:00 Fabio Rossi
2017-08-21 17:07 Evan Teran
2017-05-23 23:26 Fabio Rossi
2017-05-23 23:26 Fabio Rossi
2017-04-05 14:49 Evan Teran
2016-12-12 21:19 Evan Teran
2016-08-17 12:38 Fabio Rossi
2016-05-19 18:18 Fabio Rossi
2016-03-17  2:26 Evan Teran
2015-07-11  4:21 Evan Teran
2015-05-07  1:55 Evan Teran
2015-05-05 16:59 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran
2013-06-23 13:14 Andreas Hüttel
2012-12-16 13:27 Vadim Kuznetsov
2012-11-17 11:58 Vadim Kuznetsov
2012-05-24 17:32 Vadim Kuznetsov
2012-05-22 13:29 Vadim Kuznetsov
2012-03-26 19:48 Vadim Kuznetsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox