--- old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-06-04 22:45:33.430772973 +0900
+++ new/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-06-04 22:45:33.293273866 +0900
@@ -2078,7 +2078,7 @@
     marking_phase(vmthread_cm, maximum_heap_compaction, &_gc_tracer);
 
     bool max_on_system_gc = UseMaximumCompactionOnSystemGC
-      && gc_cause == GCCause::_java_lang_system_gc;
+      && GCCause::is_user_requested_gc(gc_cause);
     summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
 
     COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity"));
@@ -2113,7 +2113,7 @@
       // Don't check if the size_policy is ready here.  Let
       // the size_policy check that internally.
       if (UseAdaptiveGenerationSizePolicyAtMajorCollection &&
-          ((gc_cause != GCCause::_java_lang_system_gc) ||
+          (!GCCause::is_user_requested_gc(gc_cause) ||
             UseAdaptiveSizePolicyWithSystemGC)) {
         // Calculate optimal free space amounts
         assert(young_gen->max_size() >