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 2a957c84dae5774e9097bf9545272bbad7245440..c28a3168cacf88f5123429d8a37c90e3c791b775 100644 (file)
--- 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 c9f5b7f02c8f8625ab5964aa5332265d9076b97d..7fe24109e3cd14d8745ec23169171ffbcdb2a451 100644 (file)
--- 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) &&