--- old/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	2016-03-10 11:04:03.487055186 -0500
+++ new/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	2016-03-10 11:04:03.349056911 -0500
@@ -134,11 +134,6 @@
   return th;
 }
 
-void ConcurrentMarkSweepThread::stop_all() {
-  assert(_cmst != NULL, "stop_all should be called after initialization");
-  _cmst->stop();
-}
-
 void ConcurrentMarkSweepThread::stop_service() {
   // Now post a notify on CGC_lock so as to nudge
   // CMS thread(s) that might be slumbering in
--- old/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp	2016-03-10 11:04:04.229045910 -0500
+++ new/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp	2016-03-10 11:04:04.089047660 -0500
@@ -90,7 +90,6 @@
 
   // Create and start the CMS Thread, or stop it on shutdown
   static ConcurrentMarkSweepThread* start(CMSCollector* collector);
-  static void stop_all();
 
   // Synchronization using CMS token
   static void synchronize(bool is_cms_thread);
--- old/src/share/vm/gc/shared/genCollectedHeap.cpp	2016-03-10 11:04:04.975036584 -0500
+++ new/src/share/vm/gc/shared/genCollectedHeap.cpp	2016-03-10 11:04:04.835038334 -0500
@@ -1281,7 +1281,7 @@
 void GenCollectedHeap::stop() {
 #if INCLUDE_ALL_GCS
   if (UseConcMarkSweepGC) {
-    ConcurrentMarkSweepThread::stop_all();
+    ConcurrentMarkSweepThread::cmst()->stop();
   }
 #endif
 }