--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Wed Nov 08 11:05:20 2017 +0100
@@ -1689,6 +1689,7 @@
 
         StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
 
+
         // arg0: store_address
         Address store_addr(rbp, 2*BytesPerWord);
 

--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp	Wed Nov 08 11:05:20 2017 +0100
@@ -125,4 +125,5 @@
     MetaspaceCounters::update_performance_counters();
     CompressedClassSpaceCounters::update_performance_counters();
   }
-}
\ No newline at end of file
+}
+

--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp	Wed Nov 08 11:05:20 2017 +0100
@@ -41,4 +41,5 @@
   void update_counters();
 };
 
-#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
\ No newline at end of file
+#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+

--- a/src/hotspot/share/runtime/globals.hpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/share/runtime/globals.hpp	Wed Nov 08 11:05:20 2017 +0100
@@ -1412,7 +1412,7 @@
           "Use the Parallel Old garbage collector")                         \
                                                                             \
   develop(bool, UseEpsilonGC, false,                                        \
-          "Use the Epsilon (no-op) garbage collector")                      \
+          "Use the Epsilon garbage collector")                              \
                                                                             \
   product(uintx, HeapMaximumCompactionInterval, 20,                         \
           "How often should we maximally compact the heap (not allowing "   \

--- a/src/hotspot/share/services/memoryService.cpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/share/services/memoryService.cpp	Wed Nov 08 11:05:20 2017 +0100
@@ -409,7 +409,6 @@
   mgr->add_pool(old_gen);
   _pools_list->append(old_gen);
 }
-
 #endif // INCLUDE_ALL_GCS
 
 void MemoryService::add_code_heap_memory_pool(CodeHeap* heap, const char* name) {

--- a/src/hotspot/share/services/memoryService.hpp	Mon Nov 06 18:53:38 2017 +0100
+++ b/src/hotspot/share/services/memoryService.hpp	Wed Nov 08 11:05:20 2017 +0100
@@ -114,7 +114,6 @@
                                    size_t max_size,
                                    bool support_usage_threshold);
 
-
   static void add_gen_collected_heap_info(GenCollectedHeap* heap);
   static void add_parallel_scavenge_heap_info(ParallelScavengeHeap* heap);
   static void add_g1_heap_info(G1CollectedHeap* g1h);