--- old/src/hotspot/share/gc/cms/cmsHeap.cpp	2017-11-28 22:17:21.023614801 +0100
+++ new/src/hotspot/share/gc/cms/cmsHeap.cpp	2017-11-28 22:17:20.631619439 +0100
@@ -65,9 +65,6 @@
 
 CMSHeap::CMSHeap(GenCollectorPolicy *policy) :
   GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
-  _young_manager = new GCMemoryManager("ParNew", "end of minor GC");
-  _old_manager = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
-
   _workers = new WorkGang("GC Thread", ParallelGCThreads,
                           /* are_GC_task_threads */true,
                           /* are_ConcurrentGC_threads */false);
@@ -85,6 +82,13 @@
     return JNI_ENOMEM;
   }
 
+  return JNI_OK;
+}
+
+void CMSHeap::initialize_serviceability() {
+  _young_manager = new GCMemoryManager("ParNew", "end of minor GC");
+  _old_manager = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
+
   ParNewGeneration* young = (ParNewGeneration*) young_gen();
   _eden_pool = new ContiguousSpacePool(young->eden(),
                                        "Par Eden Space",
@@ -111,7 +115,6 @@
   _old_manager->add_pool(_old_pool);
   old ->set_gc_manager(_old_manager);
 
-  return JNI_OK;
 }
 
 void CMSHeap::check_gen_kinds() {