# HG changeset patch
# User jmasa
# Date 1407278472 25200
# Node ID fdb79c13bd3ba9ee144a61f74ac5ddde9a3cfb4b
# Parent  b5efc97ace6160a054be1d98fa64e0c2c1b20a31
8034056: assert(_heap_alignment >= _space_alignment) failed: heap_alignment less than space_alignment
Reviewed-by: tschatzl, sjohanss

diff -r b5efc97ace61 -r fdb79c13bd3b hotspot/src/share/vm/memory/collectorPolicy.cpp
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp	Thu Aug 07 22:28:53 2014 +0200
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp	Tue Aug 05 15:41:12 2014 -0700
@@ -176,13 +176,9 @@
 
   size_t alignment = GenRemSet::max_alignment_constraint();
 
-  // Parallel GC does its own alignment of the generations to avoid requiring a
-  // large page (256M on some platforms) for the permanent generation.  The
-  // other collectors should also be updated to do their own alignment and then
-  // this use of lcm() should be removed.
-  if (UseLargePages && !UseParallelGC) {
+  if (UseLargePages) {
       // In presence of large pages we have to make sure that our
-      // alignment is large page aware
+      // alignment is large page aware.
       alignment = lcm(os::large_page_size(), alignment);
   }