--- old/src/share/vm/gc/g1/g1CollectedHeap.cpp	2016-06-28 14:13:03.861389183 +0200
+++ new/src/share/vm/gc/g1/g1CollectedHeap.cpp	2016-06-28 14:13:03.770386441 +0200
@@ -2418,8 +2418,8 @@
   _collection_set.iterate(cl);
 }
 
-void G1CollectedHeap::collection_set_iterate_from(HeapRegionClosure *cl, uint worker_id, uint active_workers) {
-  _collection_set.iterate_from(cl, worker_id, active_workers);
+void G1CollectedHeap::collection_set_iterate_from(HeapRegionClosure *cl, uint worker_id) {
+  _collection_set.iterate_from(cl, worker_id, workers()->active_workers());
 }
 
 HeapRegion* G1CollectedHeap::next_compaction_region(const HeapRegion* from) const {
@@ -2987,7 +2987,8 @@
   }
 };
 
-bool G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
+bool
+G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
   assert_at_safepoint(true /* should_be_vm_thread */);
   guarantee(!is_gc_active(), "collection is not reentrant");