--- a/hotspot/src/os/solaris/vm/os_solaris.cpp	Mon Sep 17 11:46:19 2012 +0200
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp	Mon Sep 17 10:20:04 2012 -0400
@@ -1488,11 +1488,11 @@
 
 
 // First crack at OS-specific initialization, from inside the new thread.
-void os::initialize_thread() {
+void os::initialize_thread(Thread* thr) {
   int r = thr_main() ;
   guarantee (r == 0 || r == 1, "CR6501650 or CR6493689") ;
   if (r) {
-    JavaThread* jt = (JavaThread *)Thread::current();
+    JavaThread* jt = (JavaThread *)thr;
     assert(jt != NULL,"Sanity check");
     size_t stack_size;
     address base = jt->stack_base();