diff -r cc624b341ab2 -r 970dc585ab63 hotspot/src/share/vm/runtime/safepoint.hpp
--- a/hotspot/src/share/vm/runtime/safepoint.hpp	Thu Sep 02 11:40:02 2010 -0700
+++ b/hotspot/src/share/vm/runtime/safepoint.hpp	Fri Sep 03 17:51:07 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
@@ -147,6 +147,9 @@
   static long last_non_safepoint_interval() {
     return os::javaTimeMillis() - _end_of_last_safepoint;
   }
+  static long end_of_last_safepoint() {
+    return _end_of_last_safepoint;
+  }
   static bool is_cleanup_needed();
   static void do_cleanup_tasks();
 
@@ -228,15 +231,4 @@
   }
 };
 
-//
-// CounterDecay
-//
-// Interates through invocation counters and decrements them. This
-// is done at each safepoint.
-//
-class CounterDecay : public AllStatic {
-  static jlong _last_timestamp;
- public:
-  static  void decay();
-  static  bool is_decay_needed() { return (os::javaTimeMillis() - _last_timestamp) > CounterDecayMinIntervalLength; }
-};
+