--- old/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	2016-02-24 13:40:58.927575590 -0500
+++ new/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	2016-02-24 13:40:58.780577427 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,7 +166,7 @@
   return NULL;
 }
 
-void ConcurrentMarkSweepThread::stop() {
+void ConcurrentMarkSweepThread::stop_all() {
   // it is ok to take late safepoints here, if needed
   {
     MutexLockerEx x(Terminator_lock);