--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Thu Mar 19 15:25:54 2015 +0100
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Mon Mar 23 12:18:20 2015 +0100
@@ -156,7 +156,6 @@
   assert(val == noreg || val == rax, "parameter is just for looks");
   switch (barrier) {
 #if INCLUDE_ALL_GCS
-    case BarrierSet::G1SATBCT:
     case BarrierSet::G1SATBCTLogging:
       {
         // flatten object address if needed