--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon Apr 13 11:01:29 2015 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Thu Apr 02 10:24:24 2015 +0200
@@ -272,6 +272,11 @@
 #endif // ASSERT
 }
 
+// Non-inlined version to be used where thread.inline.hpp shouldn't be included.
+Thread* Thread::current_noinline() {
+  return Thread::current();
+}
+
 void Thread::initialize_thread_local_storage() {
   // Note: Make sure this method only calls
   // non-blocking operations. Otherwise, it might not work