--- old/src/hotspot/share/runtime/mutexLocker.hpp	2017-10-31 13:44:26.307647769 -0700
+++ new/src/hotspot/share/runtime/mutexLocker.hpp	2017-10-31 13:44:25.959649160 -0700
@@ -123,7 +123,8 @@
 extern Monitor* PeriodicTask_lock;               // protects the periodic task structure
 extern Monitor* RedefineClasses_lock;            // locks classes from parallel redefinition
 
-extern Monitor* HeapMonitor_lock;                // protects internal storage in HeapMonitoring
+extern Monitor* HeapMonitor_lock;                // protects HeapMonitor initialize and stop calls
+extern Monitor* HeapMonitorStorage_lock;         // protects internal storage in HeapMonitoring
 
 #if INCLUDE_TRACE
 extern Mutex*   JfrStacktrace_lock;              // used to guard access to the JFR stacktrace table