--- a/src/share/vm/memory/genRemSet.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/memory/genRemSet.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,8 @@
 // enumerate ref fields that have been modified (since the last
 // enumeration.)
 
-uintx GenRemSet::max_alignment_constraint() {
+uintx GenRemSet::max_alignment_constraint(Name nm) {
+  assert(nm == GenRemSet::CardTable, "Unrecognized GenRemSet type.");
   return CardTableRS::ct_max_alignment_constraint();
 }