--- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2013-06-04 17:03:24.671740663 +0200
+++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2013-06-04 17:03:24.495740659 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,6 +80,11 @@
     set_alignment(_old_gen_alignment, intra_heap_alignment());
   }
 
+  // return the (conservative) maximum heap alignment
+  static size_t max_heap_alignment() {
+    return MAX2(os::max_page_size(), intra_heap_alignment());
+  }
+
   // For use by VM operations
   enum CollectionType {
     Scavenge,
@@ -116,7 +121,7 @@
 
   // The alignment used for eden and survivors within the young gen
   // and for boundary between young gen and old gen.
-  size_t intra_heap_alignment() const { return 64 * K * HeapWordSize; }
+  static size_t intra_heap_alignment() { return 64 * K * HeapWordSize; }
 
   size_t capacity() const;
   size_t used() const;