--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Fri Aug 28 11:10:57 2015 +0200
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Tue Aug 18 17:48:35 2015 -0400
@@ -200,7 +200,7 @@
       }
       break;
 #endif // INCLUDE_ALL_GCS
-    case BarrierSet::CardTableModRef:
+    case BarrierSet::CardTableForRS:
     case BarrierSet::CardTableExtension:
       {
         if (val == noreg) {