OpenJDK / zgc / zgc
changeset 5905:140f7e5c099d
Merge
| author | zgu |
|---|---|
| date | Tue, 22 Jun 2010 10:03:12 -0400 |
| parents | 54c9f1acbd37 51e9775a3095 |
| children | b8d07a1a73e8 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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);