# HG changeset patch
# User zgu
# Date 1277215392 14400
# Node ID 3e351982aac790df0f4a0fd2be98b9d425e4658b
# Parent  b9bc732be7c06a8677746ce5841719ef9a8fb9a3# Parent  726b40449bd2df2a1e5399dc1fe61281e946f5db
Merge

diff -r b9bc732be7c0 -r 3e351982aac7 src/os/solaris/vm/osThread_solaris.hpp
--- a/src/os/solaris/vm/osThread_solaris.hpp	Thu Jun 10 08:27:35 2010 -0700
+++ b/src/os/solaris/vm/osThread_solaris.hpp	Tue Jun 22 10:03:12 2010 -0400
@@ -123,7 +123,7 @@
 
   int set_interrupt_callback    (Sync_Interrupt_Callback * cb);
   void remove_interrupt_callback(Sync_Interrupt_Callback * cb);
-  void OSThread::do_interrupt_callbacks_at_interrupt(InterruptArguments *args);
+  void do_interrupt_callbacks_at_interrupt(InterruptArguments *args);
 
  // ***************************************************************
  // java.lang.Thread.interrupt state.
diff -r b9bc732be7c0 -r 3e351982aac7 src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Thu Jun 10 08:27:35 2010 -0700
+++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Tue Jun 22 10:03:12 2010 -0400
@@ -861,7 +861,7 @@
 cmpxchg_long_func_t* os::atomic_cmpxchg_long_func = os::atomic_cmpxchg_long_bootstrap;
 add_func_t*          os::atomic_add_func          = os::atomic_add_bootstrap;
 
-extern "C" _solaris_raw_setup_fpu(address ptr);
+extern "C" void _solaris_raw_setup_fpu(address ptr);
 void os::setup_fpu() {
   address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
   _solaris_raw_setup_fpu(fpu_cntrl);