--- a/hotspot/src/share/vm/services/runtimeService.cpp	Sat Feb 15 14:41:04 2014 -0500
+++ b/hotspot/src/share/vm/services/runtimeService.cpp	Tue Feb 18 09:15:40 2014 +0100
@@ -31,11 +31,6 @@
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
 
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin);
-HS_DTRACE_PROBE_DECL(hs_private, safepoint__end);
-#endif /* !USDT2 */
-
 #if INCLUDE_MANAGEMENT
 TimeStamp RuntimeService::_app_timer;
 TimeStamp RuntimeService::_safepoint_timer;
@@ -112,11 +107,7 @@
 }
 
 void RuntimeService::record_safepoint_begin() {
-#ifndef USDT2
-  HS_DTRACE_PROBE(hs_private, safepoint__begin);
-#else /* USDT2 */
   HS_PRIVATE_SAFEPOINT_BEGIN();
-#endif /* USDT2 */
 
   // Print the time interval in which the app was executing
   if (PrintGCApplicationConcurrentTime && _app_timer.is_updated()) {
@@ -143,11 +134,7 @@
 }
 
 void RuntimeService::record_safepoint_end() {
-#ifndef USDT2
-  HS_DTRACE_PROBE(hs_private, safepoint__end);
-#else /* USDT2 */
   HS_PRIVATE_SAFEPOINT_END();
-#endif /* USDT2 */
 
   // Print the time interval for which the app was stopped
   // during the current safepoint operation.