comparison 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
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
282 def(JfrBuffer_lock , Mutex, nonleaf+1, true); 282 def(JfrBuffer_lock , Mutex, nonleaf+1, true);
283 def(JfrThreadGroups_lock , Mutex, nonleaf+1, true); 283 def(JfrThreadGroups_lock , Mutex, nonleaf+1, true);
284 def(JfrStream_lock , Mutex, nonleaf+2, true); 284 def(JfrStream_lock , Mutex, nonleaf+2, true);
285 def(JfrStacktrace_lock , Mutex, special, true ); 285 def(JfrStacktrace_lock , Mutex, special, true );
286 #endif 286 #endif
287
287 #ifdef GRAAL 288 #ifdef GRAAL
288 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true); 289 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true);
289 #endif // GRAAL 290 #endif // GRAAL
290 } 291 }
291 292