--- old/src/share/vm/memory/genCollectedHeap.cpp	2015-04-01 13:16:30.315821698 +0200
+++ new/src/share/vm/memory/genCollectedHeap.cpp	2015-04-01 13:16:30.199821703 +0200
@@ -561,7 +561,8 @@
 }
 
 void GenCollectedHeap::set_par_threads(uint t) {
-  SharedHeap::set_par_threads(t);
+  assert(t == 0 || !UseSerialGC, "Cannot have parallel threads");
+  CollectedHeap::set_par_threads(t);
   set_n_termination(t);
 }
 
--- old/src/share/vm/memory/sharedHeap.cpp	2015-04-01 13:16:30.535821689 +0200
+++ new/src/share/vm/memory/sharedHeap.cpp	2015-04-01 13:16:30.423821694 +0200
@@ -51,11 +51,6 @@
   }
 }
 
-void SharedHeap::set_par_threads(uint t) {
-  assert(t == 0 || !UseSerialGC, "Cannot have parallel threads");
-  _n_par_threads = t;
-}
-
 SharedHeap::StrongRootsScope::StrongRootsScope(SharedHeap* heap, bool activate)
   : MarkScope(activate), _sh(heap)
 {
--- old/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:16:30.735821681 +0200
+++ new/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:16:30.623821685 +0200
@@ -146,11 +146,6 @@
   // The functions below are helper functions that a subclass of
   // "SharedHeap" can use in the implementation of its virtual
   // functions.
-
-public:
-  // Sets the number of parallel threads that will be doing tasks
-  // (such as process roots) subsequently.
-  virtual void set_par_threads(uint t);
-};
+ };
 
 #endif // SHARE_VM_MEMORY_SHAREDHEAP_HPP