src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp

@@ -20,16 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
 
 // Compiler version last used for testing: gcc 4.8.2
 // Please update this information when this file changes
 
 // Implementation of class OrderAccess.

@@ -46,18 +45,16 @@
 
 inline void OrderAccess::acquire()    { compiler_barrier(); }
 inline void OrderAccess::release()    { compiler_barrier(); }
 
 inline void OrderAccess::fence() {
-  if (os::is_MP()) {
     // always use locked addl since mfence is sometimes expensive
 #ifdef AMD64
     __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
 #else
     __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
 #endif
-  }
   compiler_barrier();
 }
 
 template<>
 struct OrderAccess::PlatformOrderedStore<1, RELEASE_X_FENCE>

@@ -107,6 +104,6 @@
                       : "memory");
   }
 };
 #endif // AMD64
 
-#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP