From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:22:57 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c23abdb53cf3edf8ca07cecfaf927a4dac44aa3;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated 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 73b3a1362..6c87e838a 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
@@ -308,9 +308,9 @@ RDTSC_BARRIER(void)
 
 
 /*
- * Compiler/CPU barriers. These take the form of <mem access type>_<mem access
- * type>_MEM_BARRIER, where <mem access type> is either LD (load), ST (store)
- * or LDST (any).
+ * (Compiler + CPU) memory barriers. These take the form of
+ * <mem access type>_<mem access type>_MEM_BARRIER, where <mem access type> is
+ * either LD (load), ST (store) or LDST (any).
  *
  * On x86, we only need to care specifically about store-load
  * reordering on normal memory types and mfence, otherwise only a compiler
@@ -329,4 +329,5 @@ RDTSC_BARRIER(void)
 #define LDST_ST_MEM_BARRIER()    COMPILER_MEM_BARRIER()
 #define LDST_LDST_MEM_BARRIER()  ST_LD_MEM_BARRIER()
 
+
 #endif // _VM_BASIC_ASM_X86_COMMON_H_