changeset 38064:0e7c67a6ad89

Merge
author coleenp
date Fri, 22 Apr 2016 13:16:57 +0000
parents 93b9ff8b977e 430e0a96ef1f
children e1d81d22523e 74a151d8e51b 2ffb46735fec
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp	Fri Apr 22 14:30:58 2016 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp	Fri Apr 22 13:16:57 2016 +0000
@@ -60,7 +60,7 @@
 }
 
 void G1CardLiveData::free_large_bitmap(bm_word_t* bitmap, size_t size_in_bits) {
-  MmapArrayAllocator<bm_word_t, mtGC>::free(bitmap, size_in_bits / BitsPerWord);
+  MmapArrayAllocator<bm_word_t, mtGC>::free(bitmap, BitMap::calc_size_in_words(size_in_bits));
 }
 
 void G1CardLiveData::initialize(size_t max_capacity, uint num_max_regions) {