--- old/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp	2015-02-03 11:17:52.043666200 +0100
+++ new/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp	2015-02-03 11:17:51.973664179 +0100
@@ -72,10 +72,10 @@
   _commit_size = commit_size;
 
   assert(_committed.size() == 0, "virtual space initialized more than once");
-  BitMap::idx_t size_in_pages = align_size_up(rs.size(), commit_size) / commit_size;
-  _committed.resize(size_in_pages, /* in_resource_area */ false);
+  BitMap::idx_t size_in_commit_pages = round_to(rs.size(), commit_size);
+  _committed.resize(size_in_commit_pages, /* in_resource_area */ false);
   if (_special) {
-    _dirty.resize(size_in_pages, /* in_resource_area */ false);
+    _dirty.resize(size_in_commit_pages, /* in_resource_area */ false);
   }
 
   return true;
@@ -140,7 +140,7 @@
   return _high_boundary;
 }
 
-void G1PageBasedVirtualSpace::commit_int(char* start, char* end) {
+void G1PageBasedVirtualSpace::commit_internal(char* start, char* end) {
   guarantee(start >= _low_boundary && start < _high_boundary,
             err_msg("Start address " PTR_FORMAT" is outside of reserved space.", p2i(start)));
   guarantee(is_ptr_aligned(start, _commit_size),
@@ -187,7 +187,7 @@
       _dirty.clear_range(start, end);
     }
   } else {
-    commit_int(page_start(start), page_end(end - 1));
+    commit_internal(page_start(start), page_end(end - 1));
   }
   _committed.set_range(start, end);
 
@@ -197,7 +197,7 @@
   return zero_filled;
 }
 
-void G1PageBasedVirtualSpace::uncommit_int(char* start, char* end) {
+void G1PageBasedVirtualSpace::uncommit_internal(char* start, char* end) {
   os::uncommit_memory(start, pointer_delta(end, start, sizeof(char)));
 }
 
@@ -210,7 +210,7 @@
     // need to be cleared explicitly.
     _dirty.set_range(start, end);
   } else {
-    uncommit_int(page_start(start), page_end(end - 1));
+    uncommit_internal(page_start(start), page_end(end - 1));
   }
 
   _committed.clear_range(start, end);