# HG changeset patch
# User dholmes
# Date 1491522398 0
# Node ID 6896a3ff27a86cbe0a5aabc41d146f74428f4872
# Parent  721b8f969cc8144f93adcbe26bae640e0c99fa9a# Parent  e8e9b36783f3860c3a8fbbac2dbb9a06613e0a00
Merge

diff -r 721b8f969cc8 -r 6896a3ff27a8 hotspot/src/share/vm/runtime/interfaceSupport.hpp
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Thu Apr 06 23:01:27 2017 +0000
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Thu Apr 06 23:46:38 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,7 +115,7 @@
     assert(from != _thread_in_native, "use transition_from_native");
     assert((from & 1) == 0 && (to & 1) == 0, "odd numbers are transitions states");
     assert(thread->thread_state() == from, "coming from wrong thread state");
-    // Change to transition state (assumes total store ordering!  -Urs)
+    // Change to transition state
     thread->set_thread_state((JavaThreadState)(from + 1));
 
     // Make sure new state is seen by VM thread
@@ -146,7 +146,7 @@
   static inline void transition_and_fence(JavaThread *thread, JavaThreadState from, JavaThreadState to) {
     assert(thread->thread_state() == from, "coming from wrong thread state");
     assert((from & 1) == 0 && (to & 1) == 0, "odd numbers are transitions states");
-    // Change to transition state (assumes total store ordering!  -Urs)
+    // Change to transition state
     thread->set_thread_state((JavaThreadState)(from + 1));
 
     // Make sure new state is seen by VM thread
@@ -179,7 +179,7 @@
   static inline void transition_from_native(JavaThread *thread, JavaThreadState to) {
     assert((to & 1) == 0, "odd numbers are transitions states");
     assert(thread->thread_state() == _thread_in_native, "coming from wrong thread state");
-    // Change to transition state (assumes total store ordering!  -Urs)
+    // Change to transition state
     thread->set_thread_state(_thread_in_native_trans);
 
     // Make sure new state is seen by GC thread