--- a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp	Mon May 02 12:14:26 2016 -0400
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp	Tue May 03 22:45:27 2016 +0200
@@ -79,7 +79,7 @@
   HeapRegion*      _hr;
 
   // These are protected by "_m".
-  BitMap      _coarse_map;
+  CHeapBitMap _coarse_map;
   size_t      _n_coarse_entries;
   static jint _n_coarsenings;