*** old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue May  8 16:12:35 2012
--- new/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue May  8 16:12:34 2012

*** 2045,2065 ****
--- 2045,2057 ----
      // Set the number of GC threads to be used in this collection
      gc_task_manager()->set_active_gang();
      gc_task_manager()->task_idle_workers();
      heap->set_par_threads(gc_task_manager()->active_workers());
  
      const bool is_system_gc = gc_cause == GCCause::_java_lang_system_gc;
  
      // This is useful for debugging but don't change the output the
      // the customer sees.
      const char* gc_cause_str = "Full GC";
      if (is_system_gc && PrintGCDetails) {
        gc_cause_str = "Full GC (System)";
      }
      gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
      TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
!     TraceTime t1(gc_cause_str, PrintGC, !PrintGCDetails, gclog_or_tty);
!     TraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, gclog_or_tty);
      TraceCollectorStats tcs(counters());
      TraceMemoryManagerStats tms(true /* Full GC */,gc_cause);
  
      if (TraceGen1Time) accumulated_time()->start();
  

*** 2088,2098 ****
--- 2080,2091 ----
          mark_bitmap()->cas_tries(), mark_bitmap()->cas_retries(),
          mark_bitmap()->cas_by_another());
      }
  #endif  // #ifndef PRODUCT
  
-     bool max_on_system_gc = UseMaximumCompactionOnSystemGC && is_system_gc;
+       && gc_cause == GCCause::_java_lang_system_gc;
      summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
  
      COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity"));
      COMPILER2_PRESENT(DerivedPointerTable::set_active(false));