From: VMware, Inc <>
Date: Mon, 26 Jul 2010 19:11:01 +0000 (-0700)
Subject: Well if you're going to do that...
X-Git-Tag: 2010.07.25-280253~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5e11c0ab083b45d68bc645e6f49468fe79d5dff;p=thirdparty%2Fopen-vm-tools.git

Well if you're going to do that...

COMPILER_MEM_BARRIERS were added for lib/file. lib/lock
should get them for the same reasons...

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/lock/ulCondVar.c b/open-vm-tools/lib/lock/ulCondVar.c
index 2a957c84d..c28a3168c 100644
--- a/open-vm-tools/lib/lock/ulCondVar.c
+++ b/open-vm-tools/lib/lock/ulCondVar.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "vmware.h"
+#include "vm_basic_asm.h"
 #include "str.h"
 #include "err.h"
 #include "util.h"
@@ -114,6 +115,8 @@ MXUserNativeCVSupported(void)
                                    GetProcAddress(kernel32,
                                                    "WakeConditionVariable");
 
+         COMPILER_MEM_BARRIER();
+
          result = ((pInitializeConditionVariable != NULL) &&
                    (pSleepConditionVariableCS != NULL) &&
                    (pWakeAllConditionVariable != NULL) &&
diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index c9f5b7f02..7fe24109e 100644
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "vmware.h"
+#include "vm_basic_asm.h"
 #include "str.h"
 #include "util.h"
 #include "hashTable.h"
@@ -88,6 +89,8 @@ MXUserNativeRWSupported(void)
                                     GetProcAddress(kernel32,
                                                    "ReleaseSRWLockExclusive");
 
+         COMPILER_MEM_BARRIER();
+
          result = ((pInitializeSRWLock != NULL) &&
                    (pAcquireSRWLockShared != NULL) &&
                    (pReleaseSRWLockShared != NULL) &&