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

diff -r 03e6d34be1f5 -r d63ce76a0f0e src/share/vm/memory/collectorPolicy.cpp
--- a/src/share/vm/memory/collectorPolicy.cpp	Thu Oct 30 13:38:00 2014 -0700
+++ b/src/share/vm/memory/collectorPolicy.cpp	Tue Aug 05 15:41:12 2014 -0700
@@ -183,13 +183,9 @@
   // Requirements of any new remembered set implementations must be added here.
   size_t alignment = GenRemSet::max_alignment_constraint(GenRemSet::CardTable);
 
-  // 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) {
-      // in presence of large pages we have to make sure that our
-      // alignment is large page aware
+  if (UseLargePages) {
+      // In presence of large pages we have to make sure that our
+      // alignment is large page aware.
       alignment = lcm(os::large_page_size(), alignment);
   }