diff -r 59f226da8d81 -r 70fb742e40aa hotspot/src/share/vm/memory/genCollectedHeap.hpp
--- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp	Mon Jul 07 10:12:40 2014 +0200
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.hpp	Mon Jul 07 12:37:11 2014 +0200
@@ -78,9 +78,9 @@
   unsigned int _full_collections_completed;
 
   // Data structure for claiming the (potentially) parallel tasks in
-  // (gen-specific) roots processing.
-  SubTasksDone* _gen_process_roots_tasks;
-  SubTasksDone* gen_process_roots_tasks() { return _gen_process_roots_tasks; }
+  // (gen-specific) strong roots processing.
+  SubTasksDone* _gen_process_strong_tasks;
+  SubTasksDone* gen_process_strong_tasks() { return _gen_process_strong_tasks; }
 
   // In block contents verification, the number of header words to skip
   NOT_PRODUCT(static size_t _skip_header_HeapWords;)
@@ -403,30 +403,18 @@
   // The "so" argument determines which of the roots
   // the closure is applied to:
   // "SO_None" does none;
- private:
-  void gen_process_roots(int level,
-                         bool younger_gens_as_roots,
-                         bool activate_scope,
-                         SharedHeap::ScanningOption so,
-                         OopsInGenClosure* not_older_gens,
-                         OopsInGenClosure* weak_roots,
-                         OopsInGenClosure* older_gens,
-                         CLDClosure* cld_closure,
-                         CLDClosure* weak_cld_closure,
-                         CodeBlobClosure* code_closure);
-
- public:
-  static const bool StrongAndWeakRoots = false;
-  static const bool StrongRootsOnly    = true;
-
-  void gen_process_roots(int level,
-                         bool younger_gens_as_roots,
-                         bool activate_scope,
-                         SharedHeap::ScanningOption so,
-                         bool only_strong_roots,
-                         OopsInGenClosure* not_older_gens,
-                         OopsInGenClosure* older_gens,
-                         CLDClosure* cld_closure);
+  // "SO_AllClasses" applies the closure to all entries in the SystemDictionary;
+  // "SO_SystemClasses" to all the "system" classes and loaders;
+  // "SO_Strings" applies the closure to all entries in the StringTable.
+  void gen_process_strong_roots(int level,
+                                bool younger_gens_as_roots,
+                                // The remaining arguments are in an order
+                                // consistent with SharedHeap::process_strong_roots:
+                                bool activate_scope,
+                                SharedHeap::ScanningOption so,
+                                OopsInGenClosure* not_older_gens,
+                                OopsInGenClosure* older_gens,
+                                KlassClosure* klass_closure);
 
   // Apply "root_closure" to all the weak roots of the system.
   // These include JNI weak roots, string table,