diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
index add45ba167892..9d8a2627e7631 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
@@ -248,7 +248,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
                                                   Register tmp3) {
   Label done;
   generate_post_barrier_fast_path(masm, store_addr, new_val, Rthread, tmp1, tmp2, done, true /* new_val_may_be_null */);
-  __ bind(done); 
+  __ bind(done);
 }
 
 #if defined(COMPILER2)
diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
index 5e918bf2bf58c..6038055547065 100644
--- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
+++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
@@ -166,7 +166,7 @@ class LIR_OpG1PostBarrier : public LIR_Op {
     Register thread = _thread->as_pointer_register();
     Register tmp1 = _tmp1->as_pointer_register();
     Register tmp2 = _tmp2->as_pointer_register();
-   
+
     // This may happen for a store of x.a = x - we do not need a post barrier for those
     // as the cross-region test will always exit early anyway.
     // The post barrier implementations can assume that addr and new_val are different
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 4d545bbc9b43a..550edcbc5542f 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -48,7 +48,7 @@ class G1CardTable;
 // This separation of the data the mutator and refinement threads are working on
 // removes the need for any synchronization between them, keeping the write barrier
 // simple.
-// 
+//
 // The remembered sets for the current collection set are marked specially on the
 // card table - this is fine, because at most the mutator will overwrite it again
 // if there is a race, but G1 will scan the card either way.
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index 65c083da5205c..fee03de39e7b2 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1294,7 +1294,7 @@ void G1RemSet::merge_heap_roots(bool initial_evacuation) {
   // 3. Merge other heap roots.
   {
     WorkerThreads* workers = g1h->workers();
-    
+
     size_t const increment_length = g1h->collection_set()->increment_length();
 
     uint const num_workers = initial_evacuation ? workers->active_workers() :
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index 338ddf8305b02..fd6207d0df9af 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -789,13 +789,13 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
       G1CollectionSetCandidates* candidates = _g1h->collection_set()->candidates();
       candidates->sort_by_efficiency();
     }
-    
+
     report_statistics();
     for (uint worker = 0; worker < _active_workers; worker++) {
       _worker_stats[worker].~FreeCSetStats();
     }
     FREE_C_HEAP_ARRAY(FreeCSetStats, _worker_stats);
-    
+
     G1GCPhaseTimes* p = _g1h->phase_times();
     p->record_serial_free_cset_time_ms((Ticks::now() - serial_time).seconds() * 1000.0);