# HG changeset patch
# User zgu
# Date 1277215392 14400
# Node ID 140f7e5c099dc97790d6d9abe890fab6e205f52a
# Parent  54c9f1acbd37361ee02ec4abe2dae6b3bc9dcab0# Parent  51e9775a3095cb0f86cf299b8a7b438bea831aaf
Merge

diff -r 54c9f1acbd37 -r 140f7e5c099d hotspot/src/os/solaris/vm/osThread_solaris.hpp
--- a/hotspot/src/os/solaris/vm/osThread_solaris.hpp	Thu Jun 10 08:27:35 2010 -0700
+++ b/hotspot/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 54c9f1acbd37 -r 140f7e5c099d hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
--- a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Thu Jun 10 08:27:35 2010 -0700
+++ b/hotspot/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);