--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Tue Feb 06 13:41:49 2018 -0500
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Tue Feb 06 18:10:30 2018 -0500
@@ -676,6 +676,7 @@
     assert_different_registers(start, count);
     BarrierSet* bs = Universe::heap()->barrier_set();
     switch (bs->kind()) {
+#if INCLUDE_ALL_GCS
       case BarrierSet::G1SATBCTLogging:
         // With G1, don't generate the call if we statically know that the target in uninitialized
         if (!uninitialized_target) {
@@ -703,6 +704,7 @@
            __ bind(filtered);
          }
         break;
+#endif // INCLUDE_ALL_GCS
       case BarrierSet::CardTableForRS:
       case BarrierSet::CardTableExtension:
       case BarrierSet::ModRef:
@@ -726,6 +728,7 @@
     BarrierSet* bs = Universe::heap()->barrier_set();
     assert_different_registers(start, count);
     switch (bs->kind()) {
+#if INCLUDE_ALL_GCS
       case BarrierSet::G1SATBCTLogging:
         {
           __ pusha();                      // push registers
@@ -734,6 +737,7 @@
           __ popa();
         }
         break;
+#endif // INCLUDE_ALL_GCS
 
       case BarrierSet::CardTableForRS:
       case BarrierSet::CardTableExtension:

--- a/src/hotspot/share/services/memTracker.hpp	Tue Feb 06 13:41:49 2018 -0500
+++ b/src/hotspot/share/services/memTracker.hpp	Tue Feb 06 18:10:30 2018 -0500
@@ -36,8 +36,14 @@
 
 class Tracker : public StackObj {
  public:
-  Tracker() { }
-  void record(address addr, size_t size) { }
+  enum TrackerType {
+     uncommit,
+     release
+  };
+  Tracker(enum TrackerType type) : _type(type) { }
+  void record(address addr, size_t size);
+ private:
+  enum TrackerType  _type;
 };
 
 class MemTracker : AllStatic {