vmware kernel modules for vmware worksatation 7 host

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

8 files changed, 441 insertions, 2 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 40b55d2837ad..33b49f53c2a1 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.72 2011/03/18 14:52:53 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.73 2011/03/27 15:20:08 vadimk Exp $
+
+*vmware-modules-238.3-r8 (27 Mar 2011)
+
+  27 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/238-jobserver.patch,
+  +files/238-makefile-include.patch, +files/238-makefile-kernel-dir.patch,
+  +files/238-sema.patch, +files/238-unlocked_ioctl.patch,
+  +vmware-modules-238.3-r8.ebuild:
+  vmware kernel modules of the vmware player 3.1.3 or workstation 7.1.3 host
 
 *vmware-modules-1.0.0.25-r4 (18 Mar 2011)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index fe090b8c1e02..1579a2fd9936 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.0.24-autoconf-generated.patch 18142 RMD160 05064550c8f4308bf803298500deca0dec0585d0 SHA1 fb13499b017395d7bc4e18ca71f6c683f68e70de SHA256 9d7421c57ed8da0b172532d30db6e938b18a6f30e39c725a6fc515a7feddcd13
 AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3bf1f191 SHA1 1fcd62b30ca2a15c82ffc82924eef3447a4a4e08 SHA256 7bda64e6c0fb2fd30f71b38fa0920169356913e17bb8802ffc1e57622a0dd79c
 AUX 1.0.0.24-kernel-2.6.30.patch 1062 RMD160 8c02543ffcd46db13f179a63c589315f103b6c22 SHA1 f4d8030f1197788d9e2263ab4e3e861652702cd3 SHA256 deef76da29aec2aff33a0fe816faa1c4b61cb27858cdd6c1af70f9eaf9cde158
@@ -12,6 +15,11 @@ AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd4
 AUX 1.0.0.25-sema.patch 3756 RMD160 b182d2aa998c61afc28c68e2b859fbb894ccd550 SHA1 9cb8bcee24e294ed8dbd5f27c8160186c8c6d1fe SHA256 2fe6190be73b29b29f99e8a0c74f2b34213cd394a11aef5866a957851cc37b03
 AUX 1.0.0.25-sk_sleep.patch 2953 RMD160 39e0ae852ab54f84d40bdd9bfc343e3ae3742882 SHA1 875e4195420f52784605ad013dd77da59b0c3511 SHA256 0c318c8f54b55f6adaade2cdd805ccf8cb04a9ce279bce2382e7e4d1fd78d33f
 AUX 1.0.0.25-unlocked_ioctl.patch 1136 RMD160 a5ae0ebd54acac07144ab1510a04ebb7cabc0598 SHA1 177c3cf965d2c83084696f8132f6c7cd6ab82a2d SHA256 0bad0f0848772ec64d40a15a48c8f9d37212dd93b243e4cc5f1172371e7fbf14
+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-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0
+AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458
 AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c
 AUX sched_h-2.6.32.patch 819 RMD160 99c136ee407b892f018a9899944c73de11a6fc17 SHA1 1cd7ace0046185c069bee3f47003c7fd7a931766 SHA256 925310d18016bc5638c6a9cc8888b5b2dd5d884890386a358c6f6f527788aaa4
 DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e901021a86433efeed8 SHA1 bbbf3974afcb77fa0a670ac7821382a725cc6e4e SHA256 d010d0797bc303d2e3a69efc17dca56d3e3de5c43028c780334c57c69606ab94
@@ -21,5 +29,13 @@ DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e0588
 EBUILD vmware-modules-1.0.0.24-r3.ebuild 2299 RMD160 508a2a9420f203912e53ddf2ea766d229de7d0c5 SHA1 0d9b5a93aaa26fc25c308c8f2557f681418ad938 SHA256 220aff5eb5acad0247059a2bec788494bc7dc4327bd35bf0c3eea92a68efadb2
 EBUILD vmware-modules-1.0.0.25-r3.ebuild 2227 RMD160 eee9311501d439b63d1b657f064000c106d4e9c2 SHA1 1e3da5f429c8f04d1b3e46cb7a98171cec30d490 SHA256 3124c8b65f4245069305d5c541da8b1dd318e621f752ec8963fc285a4cae84ea
 EBUILD vmware-modules-1.0.0.25-r4.ebuild 2242 RMD160 4815c0ce9280c6bb71ed8d18df9da5a5a7a2e1b9 SHA1 eccd85cb86a6cd45aa254cbada7a65557f3a72fb SHA256 f492d54e11193dfa54a0e712e3742c984c3a30f7a2a6eb68e0c82881ba55d342
-MISC ChangeLog 16391 RMD160 7e8cf7ee617ad727bcbf4aa227c11c1bc9313de3 SHA1 9b8d282c5f59beb6ecf4ee73d03362e0444510ac SHA256 97aa88d24d187a851969035937b1a32726ce4af865f03b47b91b295608877a35
+EBUILD vmware-modules-238.3-r8.ebuild 2003 RMD160 54ebdf4d11c0059d89a34c1a3b2f6646aacf31c8 SHA1 ca4bdac450b1e90f0cbb5827787d46e86bc22017 SHA256 2585f5fc1de6fb1e2c50fa2a61dd538b43dc5b9af1f9b5133b8b8ef1bafecf45
+MISC ChangeLog 16756 RMD160 7664e2caabdd6b209fda093d7e35af1658b63b38 SHA1 eeb47e76e08ffe4ee087106cd9596ed68f37bf1b SHA256 3856a3d5d481f8c5bd7a8fe78f3001b5ae6e3de4ecebda74a4180c3b7a10ab1f
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2PVjwACgkQiLKviuHfItUhvQCgyEs7jarC4Ac6+B6lNFLILvSD
+g9EAn2Jeoh9q84jj6xWcFRzavhXosea+
+=F02F
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/238-jobserver.patch b/app-emulation/vmware-modules/files/238-jobserver.patch
new file mode 100644
index 000000000000..59a6ccca1da0
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-jobserver.patch
@@ -0,0 +1,75 @@
+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
new file mode 100644
index 000000000000..777a3fd8bb6f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-makefile-include.patch
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 000000000000..d4bd6d12fed0
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
@@ -0,0 +1,80 @@
+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-sema.patch b/app-emulation/vmware-modules/files/238-sema.patch
new file mode 100644
index 000000000000..1ebdab7ee009
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-sema.patch
@@ -0,0 +1,83 @@
+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
new file mode 100644
index 000000000000..3f1cd030c425
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
@@ -0,0 +1,33 @@
+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/vmware-modules-238.3-r8.ebuild b/app-emulation/vmware-modules/vmware-modules-238.3-r8.ebuild
new file mode 100644
index 000000000000..df25ea041352
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-238.3-r8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 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.3-r8.ebuild,v 1.1 2011/03/27 15:20:08 vadimk Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic linux-info linux-mod versionator
+
+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; 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 2 6 36 && epatch "${FILESDIR}/${PV_MAJOR}-unlocked_ioctl.patch"
+	kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="${VMWARE_GROUP}", MODE=660
+		KERNEL=="vmmon", GROUP="${VMWARE_GROUP}", MODE=660
+		KERNEL=="vsock", GROUP="${VMWARE_GROUP}", MODE=660
+	EOF
+	insinto /etc/udev/rules.d/
+	doins "${udevrules}"
+}