--- a/src/share/vm/runtime/java.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/runtime/java.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -55,7 +55,6 @@
 #include "runtime/memprofiler.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
-#include "runtime/sweeper.hpp"
 #include "runtime/task.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
@@ -100,6 +99,9 @@
 #include "opto/runtime.hpp"
 #endif
 
+#ifndef USDT2
+HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
+#endif /* !USDT2 */
 
 #ifndef PRODUCT
 
@@ -218,7 +220,9 @@
 
 
 // General statistics printing (profiling ...)
+
 void print_statistics() {
+
 #ifdef ASSERT
 
   if (CountRuntimeCalls) {
@@ -316,10 +320,6 @@
     CodeCache::print();
   }
 
-  if (PrintMethodFlushingStatistics) {
-    NMethodSweeper::print();
-  }
-
   if (PrintCodeCache2) {
     MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     CodeCache::print_internals();
@@ -387,10 +387,6 @@
     CodeCache::print();
   }
 
-  if (PrintMethodFlushingStatistics) {
-    NMethodSweeper::print();
-  }
-
 #ifdef COMPILER2
   if (PrintPreciseBiasedLockingStatistics) {
     OptoRuntime::print_named_counters();
@@ -614,8 +610,12 @@
 
 void notify_vm_shutdown() {
   // For now, just a dtrace probe.
+#ifndef USDT2
+  HS_DTRACE_PROBE(hotspot, vm__shutdown);
+  HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
+#else /* USDT2 */
   HOTSPOT_VM_SHUTDOWN();
-  HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
+#endif /* USDT2 */
 }
 
 void vm_direct_exit(int code) {