--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Fri Mar 27 12:43:45 2015 +0100
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Sun Mar 29 09:20:27 2015 -0400
@@ -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