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 8fd5290e023e52751eca49394c25e4859b356090..362350971ed3f8a6a44521a66f2e0f29760f4aac 100644 (file)
--- 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()
 
 /*