Index: vm/include/open/vm_gc.h =================================================================== --- vm/include/open/vm_gc.h (revision 559670) +++ vm/include/open/vm_gc.h (working copy) @@ -148,11 +148,6 @@ }; /** - * @return Thread safepoint state. - */ -VMEXPORT enum safepoint_state get_global_safepoint_status(); - -/** * @return TRUE if no apparent trash was found in the object. * * Used for debugging. Index: vm/vmcore/include/vm_threads.h =================================================================== --- vm/vmcore/include/vm_threads.h (revision 559670) +++ vm/vmcore/include/vm_threads.h (working copy) @@ -131,7 +131,4 @@ jint jthread_allocate_vm_thread_pool(JavaVM * java_vm, vm_thread_t vm_thread); void jthread_deallocate_vm_thread_pool(vm_thread_t vm_thread); -extern volatile VM_thread *p_the_safepoint_control_thread; // only set when a gc is happening -extern volatile safepoint_state global_safepoint_status; - #endif //!_VM_THREADS_H_ Index: vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp =================================================================== --- vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp (revision 559670) +++ vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp (working copy) @@ -137,14 +137,6 @@ // it is convenient to have gc_enabled_status == disabled // during the enumeration -salikh - // Mark the global safepoint status as enumerating the universe.. - assert(get_global_safepoint_status() == nill); - global_safepoint_status = enumerate_the_universe; - - // Identify the thread driving the GC. - assert(p_the_safepoint_control_thread == 0); - p_the_safepoint_control_thread = p_TLS_vmthread; - stop_the_world_root_set_enumeration(); assert(!hythread_is_suspend_enabled()); @@ -157,11 +149,6 @@ void vm_resume_threads_after() { TRACE2("vm.gc", "vm_resume_threads_after()"); - // Check that we are still enumerating the universe and formally mark the end of it. - assert(get_global_safepoint_status() == enumerate_the_universe); - global_safepoint_status = nill; - assert(p_the_safepoint_control_thread == p_TLS_vmthread); - p_the_safepoint_control_thread = 0; jvmti_send_gc_finish_event(); jvmti_clean_reclaimed_object_tags(); Index: vm/vmcore/src/class_support/C_Interface.cpp =================================================================== --- vm/vmcore/src/class_support/C_Interface.cpp (revision 559670) +++ vm/vmcore/src/class_support/C_Interface.cpp (working copy) @@ -2381,13 +2381,6 @@ -enum safepoint_state get_global_safepoint_status() -{ - return global_safepoint_status; -} //get_global_safepoint_status - - - void vm_gc_lock_enum() { hythread_global_lock(); Index: vm/vmcore/src/thread/thread_manager.cpp =================================================================== --- vm/vmcore/src/thread/thread_manager.cpp (revision 559670) +++ vm/vmcore/src/thread/thread_manager.cpp (working copy) @@ -73,18 +73,7 @@ #define LOG_DOMAIN "vmcore.thread" #include "cxxlog.h" -#ifdef __cplusplus -extern "C" -{ -#endif -volatile VM_thread *p_the_safepoint_control_thread = 0; // only set when a gc is happening -volatile safepoint_state global_safepoint_status = nill; - -#ifdef __cplusplus -} -#endif - jint jthread_allocate_vm_thread_pool(JavaVM *java_vm, vm_thread_t vm_thread) {