--- old/src/share/vm/gc/g1/g1RemSet.cpp	2017-06-30 11:28:11.792001061 +0200
+++ new/src/share/vm/gc/g1/g1RemSet.cpp	2017-06-30 11:28:11.631996060 +0200
@@ -256,7 +256,7 @@
       return;
     }
 
-    size_t const num_chunks = align_size_up(_cur_dirty_region * HeapRegion::CardsPerRegion, G1ClearCardTableTask::chunk_size()) / G1ClearCardTableTask::chunk_size();
+    size_t const num_chunks = align_up(_cur_dirty_region * HeapRegion::CardsPerRegion, G1ClearCardTableTask::chunk_size()) / G1ClearCardTableTask::chunk_size();
     uint const num_workers = (uint)MIN2(num_chunks, (size_t)workers->active_workers());
     size_t const chunk_length = G1ClearCardTableTask::chunk_size() / HeapRegion::CardsPerRegion;