fixed sema patch

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

3 files changed, 84 insertions, 72 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index a90aeb6609ac..f39294ac2fd2 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,9 @@
 # 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.74 2011/03/27 15:40:08 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.75 2011/03/30 14:48:33 vadimk Exp $
+
+  30 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/208-sema.patch:
+  corrected sema patch
 
 *vmware-modules-208.2 (27 Mar 2011)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 79682bcf1e2c..b6ebfec2ba53 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -15,7 +15,7 @@ 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 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
@@ -35,12 +35,12 @@ EBUILD vmware-modules-1.0.0.25-r3.ebuild 2227 RMD160 eee9311501d439b63d1b657f064
 EBUILD vmware-modules-1.0.0.25-r4.ebuild 2242 RMD160 4815c0ce9280c6bb71ed8d18df9da5a5a7a2e1b9 SHA1 eccd85cb86a6cd45aa254cbada7a65557f3a72fb SHA256 f492d54e11193dfa54a0e712e3742c984c3a30f7a2a6eb68e0c82881ba55d342
 EBUILD vmware-modules-208.2.ebuild 1855 RMD160 a42bdef87a95590f779272fe8037d528d9bb6a5c SHA1 83d002b0c1432baab071dcd44a41907dfeb52c70 SHA256 e8452a07897634bbb71bae4afec2c28982223727ec9246b30882705f6ce08f43
 EBUILD vmware-modules-238.3-r8.ebuild 2003 RMD160 54ebdf4d11c0059d89a34c1a3b2f6646aacf31c8 SHA1 ca4bdac450b1e90f0cbb5827787d46e86bc22017 SHA256 2585f5fc1de6fb1e2c50fa2a61dd538b43dc5b9af1f9b5133b8b8ef1bafecf45
-MISC ChangeLog 17011 RMD160 a5587cfe76383acc648a1ad3346e7bd5fcd4c315 SHA1 ef6d6899ca75b2a19f1d27e490a0a0a072ab7513 SHA256 58f9657976d19aa48ea10585ad515040a2568ad9f35b33948ea1be92bab6ae2a
+MISC ChangeLog 17108 RMD160 a299269b0ab6aaddd72d0f9eaf0da67ccf20acf7 SHA1 5f265ce93922bbd2d207c2944690099e1e0eeaee SHA256 f5a08aadbbf25aa3ba2b53af5e90bd54bb40f9d0b96b4399bbb300e871bcfc30
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2PWuYACgkQiLKviuHfItXndQCaAg6tGofvcmxb1b4/nfLtPN3X
-r9sAnRRaavlOryeoW3douGZuMKxu2S3A
-=q8gD
+iEYEARECAAYFAk2TQ14ACgkQiLKviuHfItVvQACeK3MFxypSe6uQ5jkwHrX5xz79
+1oMAnjQVFYyIH6frgMMVND++KBTLeqQq
+=kNxH
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/208-sema.patch b/app-emulation/vmware-modules/files/208-sema.patch
index 1ebdab7ee009..cbfbe9a3ab52 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__ */