diff src/share/vm/runtime/mutexLocker.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children beea13269eab
line wrap: on
line diff
--- a/src/share/vm/runtime/mutexLocker.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/runtime/mutexLocker.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -284,6 +284,7 @@
   def(JfrStream_lock               , Mutex,   nonleaf+2,   true);
   def(JfrStacktrace_lock           , Mutex,   special,     true );
 #endif
+
 #ifdef GRAAL
   def(GraalDeoptLeafGraphIds_lock  , Mutex,   special,     true);
 #endif // GRAAL