--- a/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -35,6 +35,14 @@
 #include "utilities/dtrace.hpp"
 
 
+#ifndef USDT2
+HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin);
+HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end);
+
+HS_DTRACE_PROBE_DECL(hs_private, cms__remark__begin);
+HS_DTRACE_PROBE_DECL(hs_private, cms__remark__end);
+#endif /* !USDT2 */
+
 //////////////////////////////////////////////////////////
 // Methods in abstract class VM_CMS_Operation
 //////////////////////////////////////////////////////////
@@ -130,7 +138,12 @@
     // Nothing to do.
     return;
   }
-  HS_PRIVATE_CMS_INITMARK_BEGIN();
+#ifndef USDT2
+  HS_DTRACE_PROBE(hs_private, cms__initmark__begin);
+#else /* USDT2 */
+  HS_PRIVATE_CMS_INITMARK_BEGIN(
+                                );
+#endif /* USDT2 */
 
   _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
 
@@ -146,7 +159,12 @@
 
   _collector->_gc_timer_cm->register_gc_pause_end();
 
-  HS_PRIVATE_CMS_INITMARK_END();
+#ifndef USDT2
+  HS_DTRACE_PROBE(hs_private, cms__initmark__end);
+#else /* USDT2 */
+  HS_PRIVATE_CMS_INITMARK_END(
+                                );
+#endif /* USDT2 */
 }
 
 //////////////////////////////////////////////////////////
@@ -157,7 +175,12 @@
     // Nothing to do.
     return;
   }
-  HS_PRIVATE_CMS_REMARK_BEGIN();
+#ifndef USDT2
+  HS_DTRACE_PROBE(hs_private, cms__remark__begin);
+#else /* USDT2 */
+  HS_PRIVATE_CMS_REMARK_BEGIN(
+                                );
+#endif /* USDT2 */
 
   _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
 
@@ -174,7 +197,12 @@
   _collector->save_heap_summary();
   _collector->_gc_timer_cm->register_gc_pause_end();
 
-  HS_PRIVATE_CMS_REMARK_END();
+#ifndef USDT2
+  HS_DTRACE_PROBE(hs_private, cms__remark__end);
+#else /* USDT2 */
+  HS_PRIVATE_CMS_REMARK_END(
+                                );
+#endif /* USDT2 */
 }
 
 // VM operation to invoke a concurrent collection of a
@@ -230,7 +258,7 @@
       // No need to do a young gc, we'll just nudge the CMS thread
       // in the doit() method above, to be executed soon.
       assert(_gc_count_before < gch->total_collections(),
-             "total_collections() should be monotonically increasing");
+             "total_collections() should be monotnically increasing");
       return false;  // no need for foreground young gc
     }
   }