vmware-modules-208.2: corrected sema patch

svn path=/trunk/; revision=468

3 files changed, 80 insertions, 68 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index dd036c5..98d152a 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/208-sema.patch:
+  corrected sema patch
+
   30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
   +vmware-modules-238.4.ebuild:
   bumped to 238.4
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 8522ada..6918748 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,4 +1,4 @@
-AUX 208-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0
+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-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
@@ -15,5 +15,5 @@ EBUILD vmware-modules-138.10.7.ebuild 1825 RMD160 3e4999c91f97217815c9d8ad852a63
 EBUILD vmware-modules-208.2.ebuild 1861 RMD160 6641f57a7906ff1eb243e14561c37475eda6d910 SHA1 aab9187681ca6b88b4178b98d259116130c39037 SHA256 140d78cc98da4cd19a24d593bec01417793592212273d632adfc465fe80ff311
 EBUILD vmware-modules-238.3-r8.ebuild 1855 RMD160 e576a15e0e9c5f219ebc0edc7bc0ca04f906ca5f SHA1 c875538b3ae4168d11de2e4ceeca161ea11e168b SHA256 22b63d000b05a06217c927b0b1b5dc54087cd4eb17527c99c3cb8affcdedfa3a
 EBUILD vmware-modules-238.4.ebuild 1780 RMD160 0c5f9b31e4af93c55096e9a00d4a5fa53acc8c5b SHA1 1a88bb066bbe42a81e3f44a51957db812671d6e7 SHA256 770a9135206ca9f5b90239a38b24349d9b04cd2919a274f6cfc23250c63079aa
-MISC ChangeLog 4767 RMD160 38d8e132e4325f359265ead22c760488e6ce40a4 SHA1 6e4bec8077c3f8034fd5ef111b0ddad87a7a3e8e SHA256 1da5fb0c2e96247cdeb4db14706d9250b4e9c9dbc1d9aea7e1c8f9991b0d0012
+MISC ChangeLog 4864 RMD160 ecc62139b116c51b21b88455f7be8c16b779215b SHA1 88f6773dc73010dc9bfae52f0a660351a5e49a85 SHA256 e072fb79946af30a5f588747c330123343fc3a818807af02ac5d1c78a19ac355
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/files/208-sema.patch b/app-emulation/vmware-modules/files/208-sema.patch
index 1ebdab7..cbfbe9a 100644
--- a/app-emulation/vmware-modules/files/208-sema.patch
+++ b/app-emulation/vmware-modules/files/208-sema.patch
@@ -1,83 +1,92 @@
-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 @@
+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)
 +#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)
++   #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
++#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 /* __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)
 +#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)
++   #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
++#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 /* __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
++
  
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+ #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)
-    /*
-     * 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)
++   #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
+ 
+ #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__ */