--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Tue Dec 15 00:16:09 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Tue Dec 15 09:58:29 2015 +0100
@@ -3600,13 +3600,13 @@
 }
 #endif // TASKQUEUE_STATS
 
-void G1CollectedHeap::log_gc_footer(double pause_time_counter) {
+void G1CollectedHeap::log_gc_footer(jlong pause_time_counter) {
   if (evacuation_failed()) {
     log_info(gc)("To-space exhausted");
   }
 
-  double pause_time_sec = TimeHelper::counter_to_seconds(pause_time_counter);
-  g1_policy()->print_phases(pause_time_sec);
+  double pause_time_ms = TimeHelper::counter_to_millis(pause_time_counter);
+  g1_policy()->print_phases(pause_time_ms);
 
   g1_policy()->print_detailed_heap_transition();
 }
@@ -3698,8 +3698,7 @@
     }
     GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
 
-    double pause_start_sec = os::elapsedTime();
-    double pause_start_counter = os::elapsed_counter();
+    jlong pause_start_counter = os::elapsed_counter();
     g1_policy()->note_gc_start(active_workers);
 
     TraceCollectorStats tcs(g1mm()->incremental_collection_counters());