--- old/src/share/vm/memory/cardTableModRefBS.hpp	2015-05-13 14:05:33.357114567 +0200
+++ new/src/share/vm/memory/cardTableModRefBS.hpp	2015-05-13 14:05:33.245110844 +0200
@@ -178,14 +178,15 @@
   // region mr in the given space and apply cl to any dirty sub-regions
   // of mr. Clears the dirty cards as they are processed.
   void non_clean_card_iterate_possibly_parallel(Space* sp, MemRegion mr,
-                                                OopsInGenClosure* cl, CardTableRS* ct);
+                                                OopsInGenClosure* cl, CardTableRS* ct,
+                                                uint n_threads);
 
  private:
   // Work method used to implement non_clean_card_iterate_possibly_parallel()
   // above in the parallel case.
   void non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr,
                                             OopsInGenClosure* cl, CardTableRS* ct,
-                                            int n_threads);
+                                            uint n_threads);
 
  protected:
   // Dirty the bytes corresponding to "mr" (not all of which must be
@@ -238,6 +239,7 @@
   void process_stride(Space* sp,
                       MemRegion used,
                       jint stride, int n_strides,
+                      bool parallel,
                       OopsInGenClosure* cl,
                       CardTableRS* ct,
                       jbyte** lowest_non_clean,