--- a/hotspot/src/share/vm/runtime/safepoint.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -363,7 +363,7 @@
 #endif // ASSERT
 
   // Update the count of active JNI critical regions
-  GC_locker::set_jni_lock_count(_current_jni_active_count);
+  GCLocker::set_jni_lock_count(_current_jni_active_count);
 
   if (log_is_enabled(Debug, safepoint)) {
     VM_Operation *op = VMThread::vm_operation();
@@ -563,7 +563,7 @@
       if (!thread->do_critical_native_unlock()) {
 #ifdef ASSERT
         if (!thread->in_critical()) {
-          GC_locker::increment_debug_jni_lock_count();
+          GCLocker::increment_debug_jni_lock_count();
         }
 #endif
         thread->enter_critical();