diff -r 59f226da8d81 -r 70fb742e40aa hotspot/src/share/vm/oops/klass.hpp
--- a/hotspot/src/share/vm/oops/klass.hpp	Mon Jul 07 10:12:40 2014 +0200
+++ b/hotspot/src/share/vm/oops/klass.hpp	Mon Jul 07 12:37:11 2014 +0200
@@ -553,10 +553,7 @@
   // The is_alive closure passed in depends on the Garbage Collector used.
   bool is_loader_alive(BoolObjectClosure* is_alive);
 
-  static void clean_weak_klass_links(BoolObjectClosure* is_alive, bool clean_alive_klasses = true);
-  static void clean_subklass_tree(BoolObjectClosure* is_alive) {
-    clean_weak_klass_links(is_alive, false /* clean_alive_klasses */);
-  }
+  static void clean_weak_klass_links(BoolObjectClosure* is_alive);
 
   // iterators
   virtual int oop_oop_iterate(oop obj, ExtendedOopClosure* blk) = 0;
@@ -663,7 +660,7 @@
  private:
   // barriers used by klass_oop_store
   void klass_update_barrier_set(oop v);
-  void klass_update_barrier_set_pre(oop* p, oop v);
+  void klass_update_barrier_set_pre(void* p, oop v);
 };
 
 #endif // SHARE_VM_OOPS_KLASS_HPP