diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2011-01-13 21:01:39 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2011-01-13 21:01:39 +0000 |
| commit | 2f4841ff015a6f67a458fd5b77e552eb4840cbd5 (patch) | |
| tree | 4882751a0adb736c415afd04b3d83216a2853499 /app-emulation/vmware-modules/files | |
| parent | Marking Moose-1.19 ~ppc for bug 343479 (diff) | |
| download | gentoo-2-2f4841ff015a6f67a458fd5b77e552eb4840cbd5.tar.gz gentoo-2-2f4841ff015a6f67a458fd5b77e552eb4840cbd5.tar.bz2 gentoo-2-2f4841ff015a6f67a458fd5b77e552eb4840cbd5.zip | |
Bugs 345145 and 349649 and 351592
(Portage version: 2.1.9.31/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vmware-modules/files')
| -rw-r--r-- | app-emulation/vmware-modules/files/1.0.0.25-sema.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-sema.patch b/app-emulation/vmware-modules/files/1.0.0.25-sema.patch new file mode 100644 index 000000000000..f5b06f3ccc0a --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.25-sema.patch @@ -0,0 +1,87 @@ +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__ */ |