--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2013-10-25 15:28:53.000000000 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2013-10-25 15:28:53.000000000 +0200
@@ -1092,7 +1092,9 @@
   jint initialize();
 
   // Return the (conservative) maximum heap alignment for any G1 heap
-  static size_t conservative_max_heap_alignment();
+  static size_t conservative_max_heap_alignment() {
+    return HeapRegion::max_region_size();
+  }
 
   // Initialize weak reference processing.
   virtual void ref_processing_init();