--- old/src/os/solaris/vm/thread_solaris.inline.hpp	2015-11-02 01:33:15.883487818 -0500
+++ new/src/os/solaris/vm/thread_solaris.inline.hpp	2015-11-02 01:33:14.631417452 -0500
@@ -29,22 +29,6 @@
 #error "This file should only be included from thread.inline.hpp"
 #endif
 
-#include "runtime/thread.hpp"
-#include "runtime/threadLocalStorage.hpp"
-
-// Thread::current is "hot" it's called > 128K times in the 1st 500 msecs of
-// startup.
-// ThreadLocalStorage::thread is warm -- it's called > 16K times in the same
-// period.   Thread::current() now calls ThreadLocalStorage::thread() directly.
-// For SPARC, to avoid excessive register window spill-fill faults,
-// we aggressively inline these routines.
-
-inline void ThreadLocalStorage::set_thread(Thread* thread) {
-  _thr_current = thread;
-}
-
-inline Thread* ThreadLocalStorage::thread()  {
-  return _thr_current;
-}
+// Nothing to do
 
 #endif // OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP