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

Memory barriers: LDST_LDST_MEM_BARRIER -> SMP_RW_BARRIER_RW

Delete the old macro that is now unused.
---

diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index 0b3db45f1..bca9053c6 100644
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -305,7 +305,7 @@ Atomic_ReadIfEqualWrite128(Atomic_uint128 *ptr,   // IN/OUT
    } res, _old = { oldVal }, _new = { newVal };
    uint32 failed;
 
-   LDST_LDST_MEM_BARRIER();
+   SMP_RW_BARRIER_RW();
    __asm__ __volatile__(
       "1: ldxp    %x0, %x1, %3        \n\t"
       "   cmp     %x0, %x4            \n\t"
@@ -324,7 +324,7 @@ Atomic_ReadIfEqualWrite128(Atomic_uint128 *ptr,   // IN/OUT
         "r" (_new.hi)
       : "cc"
    );
-   LDST_LDST_MEM_BARRIER();
+   SMP_RW_BARRIER_RW();
 
    return res.raw;
 #endif
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 cc278d8ff..bd1a081c6 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
@@ -465,6 +465,5 @@ SMP_W_BARRIER_R(void)
 #define ST_LDST_MEM_BARRIER()    SMP_W_BARRIER_RW()
 #define LDST_LD_MEM_BARRIER()    SMP_RW_BARRIER_R()
 #define LDST_ST_MEM_BARRIER()    SMP_RW_BARRIER_W()
-#define LDST_LDST_MEM_BARRIER()  SMP_RW_BARRIER_RW()
 
 #endif // _VM_BASIC_ASM_X86_COMMON_H_
diff --git a/open-vm-tools/modules/linux/vsock/linux/notifyQState.c b/open-vm-tools/modules/linux/vsock/linux/notifyQState.c
index 3e7f2aef4..7231f2662 100644
--- a/open-vm-tools/modules/linux/vsock/linux/notifyQState.c
+++ b/open-vm-tools/modules/linux/vsock/linux/notifyQState.c
@@ -551,7 +551,7 @@ VSockVmciNotifyPktRecvPostDequeue(struct sock *sk,               // IN
    err = 0;
 
    if (dataRead) {
-      LDST_LDST_MEM_BARRIER();
+      SMP_RW_BARRIER_RW();
 
       freeSpace = vmci_qpair_consume_free_space(vsk->qpair);
       wasFull = freeSpace == copied;
@@ -635,7 +635,7 @@ VSockVmciNotifyPktSendPostEnqueue(struct sock *sk,               // IN
 
    vsk = vsock_sk(sk);
 
-   LDST_LDST_MEM_BARRIER();
+   SMP_RW_BARRIER_RW();
 
    wasEmpty = (vmci_qpair_produce_buf_ready(vsk->qpair) == written);
    if (wasEmpty) {