From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 6 May 2022 21:28:00 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf19772adf10706fa1da83aca21a9fc45977c387;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

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 8fd5290e0..362350971 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
@@ -536,13 +536,13 @@ LOCKED_INSN_BARRIER(void)
  */
 
 #define SMP_R_BARRIER_R()     INTR_R_BARRIER_R()
-#define SMP_R_BARRIER_W()     COMPILER_MEM_BARRIER()
-#define SMP_R_BARRIER_RW()    COMPILER_MEM_BARRIER()
+#define SMP_R_BARRIER_W()     INTR_R_BARRIER_W()
+#define SMP_R_BARRIER_RW()    INTR_R_BARRIER_RW()
 #define SMP_W_BARRIER_R()     LOCKED_INSN_BARRIER()
 #define SMP_W_BARRIER_W()     INTR_W_BARRIER_W()
 #define SMP_W_BARRIER_RW()    LOCKED_INSN_BARRIER()
 #define SMP_RW_BARRIER_R()    LOCKED_INSN_BARRIER()
-#define SMP_RW_BARRIER_W()    COMPILER_MEM_BARRIER()
+#define SMP_RW_BARRIER_W()    INTR_RW_BARRIER_W()
 #define SMP_RW_BARRIER_RW()   LOCKED_INSN_BARRIER()
 
 /*