*** old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Oct 25 15:28:53 2013
--- new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Oct 25 15:28:53 2013

*** 1090,1100 ****
--- 1090,1102 ----
    // maximum sizes and remembered and barrier sets
    // specified by the policy object.
    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();
  
    void set_par_threads(uint t) {