diff src/share/vm/runtime/os.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 957c266d8bc5 716e6ef4482a
children 2cb439954abf
line wrap: on
line diff
--- a/src/share/vm/runtime/os.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/runtime/os.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -387,7 +387,7 @@
   static void pd_start_thread(Thread* thread);
   static void start_thread(Thread* thread);
 
-  static void initialize_thread();
+  static void initialize_thread(Thread* thr);
   static void free_thread(OSThread* osthread);
 
   // thread id on Linux/64bit is 64bit, on Windows and Solaris, it's 32bit