diff -r 25cac6c2349d -r 57791914628c hotspot/src/share/vm/memory/genOopClosures.inline.hpp
--- a/hotspot/src/share/vm/memory/genOopClosures.inline.hpp	Mon Dec 22 17:40:46 2014 +0000
+++ b/hotspot/src/share/vm/memory/genOopClosures.inline.hpp	Thu Dec 18 13:26:37 2014 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2014, 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
@@ -44,7 +44,7 @@
   _gen_boundary = _gen->reserved().start();
   // Barrier set for the heap, must be set after heap is initialized
   if (_rs == NULL) {
-    GenRemSet* rs = SharedHeap::heap()->rem_set();
+    GenRemSet* rs = GenCollectedHeap::heap()->rem_set();
     _rs = (CardTableRS*)rs;
   }
 }