* [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 1.0.0.25-sema.patch
@ 2011-01-13 21:01 Vadim Kuznetsov (vadimk)
0 siblings, 0 replies; only message in thread
From: Vadim Kuznetsov (vadimk) @ 2011-01-13 21:01 UTC (permalink / raw
To: gentoo-commits
vadimk 11/01/13 21:01:39
Added: 1.0.0.25-sema.patch
Log:
Bugs 345145 and 349649 and 351592
(Portage version: 2.1.9.31/cvs/Linux x86_64)
Revision Changes Path
1.1 app-emulation/vmware-modules/files/1.0.0.25-sema.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.25-sema.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.25-sema.patch?rev=1.1&content-type=text/plain
Index: 1.0.0.25-sema.patch
===================================================================
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h
--- vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:55:57.016999997 +0100
+++ vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:57:39.719999997 +0100
@@ -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 -ru vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h
--- vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:55:57.028999997 +0100
+++ vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:58:57.529999998 +0100
@@ -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 -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h
--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h 2011-01-11 21:55:57.022999997 +0100
+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h 2011-01-11 21:58:23.678999996 +0100
@@ -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 -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h
--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h 2011-01-11 21:55:57.020999997 +0100
+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h 2011-01-11 22:02:29.522999997 +0100
@@ -203,5 +203,13 @@
}
#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 -ru vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h
--- vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h 2011-01-11 21:55:57.040999997 +0100
+++ vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h 2011-01-11 22:03:59.066999997 +0100
@@ -88,4 +88,14 @@
#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__ */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-13 21:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-13 21:01 [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 1.0.0.25-sema.patch Vadim Kuznetsov (vadimk)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox