src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp

@@ -20,17 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
 
 #include <intrin.h>
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
 
 // Compiler version last used for testing: Microsoft Visual Studio 2010
 // Please update this information when this file changes
 
 // Implementation of class OrderAccess.

@@ -61,15 +60,13 @@
 
 inline void OrderAccess::fence() {
 #ifdef AMD64
   StubRoutines_fence();
 #else
-  if (os::is_MP()) {
     __asm {
       lock add dword ptr [esp], 0;
     }
-  }
 #endif // AMD64
   compiler_barrier();
 }
 
 #ifndef AMD64

@@ -111,6 +108,6 @@
     }
   }
 };
 #endif // AMD64
 
-#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP