--- a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	Tue Oct 18 19:08:24 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	Mon Oct 17 05:44:43 2016 -0700
@@ -1962,6 +1962,8 @@
       // due to cache line collision.
       __ serialize_memory(rthread, r2);
     }
+  } else {
+    __ strw(rscratch1, Address(rthread, JavaThread::thread_state_offset()));
   }
 
   // check for safepoint operation in progress and/or pending suspend requests