--- old/src/hotspot/share/trace/tracingExport.hpp	2018-04-03 17:00:22.000000000 -0400
+++ new/src/hotspot/share/trace/tracingExport.hpp	2018-04-03 17:00:22.000000000 -0400
@@ -29,8 +29,8 @@
 
 class TracingExport : AllStatic {
  public:
-  static Thread* get_sampler_thread();
-  static void set_sampler_thread(Thread* thread);
+  static Thread* sampler_thread_acquire();
+  static void set_sampler_thread_with_lock(Thread* thread);
 
  private:
   static Thread* volatile _sampler_thread;