From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:34 +0000 (-0700)
Subject: Memory barriers: ST_LD_MEM_BARRIER -> SMP_W_BARRIER_R
X-Git-Tag: stable-10.2.0~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79a815083e2ba1b2f6c03b5aa4ae5275e0416a95;p=thirdparty%2Fopen-vm-tools.git

Memory barriers: ST_LD_MEM_BARRIER -> SMP_W_BARRIER_R

Remove the now unused old macro name.
---

diff --git a/open-vm-tools/lib/include/vm_basic_asm_x86_common.h b/open-vm-tools/lib/include/vm_basic_asm_x86_common.h
index 2b02b7016..c743d591d 100644
--- a/open-vm-tools/lib/include/vm_basic_asm_x86_common.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_x86_common.h
@@ -413,7 +413,7 @@ SMP_W_BARRIER_R(void)
 #elif defined _MSC_VER
    _InterlockedXor(&temp, 1);
 #else
-#error ST_LD_MEM_BARRIER not defined for this compiler
+#error SMP_W_BARRIER_R not defined for this compiler
 #endif
    COMPILER_MEM_BARRIER();
 }
@@ -460,7 +460,6 @@ SMP_W_BARRIER_R(void)
 #define LD_LD_MEM_BARRIER()      SMP_R_BARRIER_R()
 #define LD_ST_MEM_BARRIER()      SMP_R_BARRIER_W()
 #define LD_LDST_MEM_BARRIER()    SMP_R_BARRIER_RW()
-#define ST_LD_MEM_BARRIER()      SMP_W_BARRIER_R()
 
 
 #endif // _VM_BASIC_ASM_X86_COMMON_H_