--- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Mon Oct 19 15:21:01 2015 +0200
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Tue Oct 20 14:00:00 2015 +0200
@@ -433,7 +433,7 @@
     return; // GC is disabled (e.g. JNI GetXXXCritical operation)
   }
 
-  GCIdMark gc_id_mark;
+  GCIdMarkAndRestore gc_id_mark;
 
   const bool do_clear_all_soft_refs = clear_all_soft_refs ||
                           collector_policy()->should_clear_all_soft_refs();