# HG changeset patch
# User mgronlun
# Date 1455896941 -3600
#      Fri Feb 19 16:49:01 2016 +0100
# Node ID dff3cafd4ad887d4fa3aab989402d6cc539714a3
# Parent  95e00dc4c5162f26f91aa9fdfc25ae9d3c3338bd
[mq]: 8149803

diff --git a/src/share/vm/runtime/mutexLocker.cpp b/src/share/vm/runtime/mutexLocker.cpp
--- a/src/share/vm/runtime/mutexLocker.cpp
+++ b/src/share/vm/runtime/mutexLocker.cpp
@@ -286,9 +286,9 @@
 
 #ifdef INCLUDE_TRACE
   def(JfrMsg_lock                  , Monitor, leaf,        true,  Monitor::_safepoint_check_always);
-  def(JfrBuffer_lock               , Mutex,   leaf,        true,  Monitor::_safepoint_check_never);
+  def(JfrBuffer_lock               , Mutex,   special,     true,  Monitor::_safepoint_check_never);
   def(JfrThreadGroups_lock         , Mutex,   leaf,        true,  Monitor::_safepoint_check_always);
-  def(JfrStream_lock               , Mutex,   nonleaf,     true,  Monitor::_safepoint_check_never);
+  def(JfrStream_lock               , Mutex,   special+1,   true,  Monitor::_safepoint_check_never);
   def(JfrStacktrace_lock           , Mutex,   special,     true,  Monitor::_safepoint_check_sometimes);
 #endif
 
