comparison src/os/bsd/vm/mutex_bsd.inline.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents f34d701e952e
children
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
25 #ifndef OS_BSD_VM_MUTEX_BSD_INLINE_HPP 25 #ifndef OS_BSD_VM_MUTEX_BSD_INLINE_HPP
26 #define OS_BSD_VM_MUTEX_BSD_INLINE_HPP 26 #define OS_BSD_VM_MUTEX_BSD_INLINE_HPP
27 27
28 #include "os_bsd.inline.hpp" 28 #include "os_bsd.inline.hpp"
29 #include "runtime/interfaceSupport.hpp" 29 #include "runtime/interfaceSupport.hpp"
30 #include "thread_bsd.inline.hpp" 30 #include "runtime/thread.inline.hpp"
31 31
32 32
33 // Reconciliation History 33 // Reconciliation History
34 // mutex_solaris.inline.hpp 1.5 99/06/22 16:38:49 34 // mutex_solaris.inline.hpp 1.5 99/06/22 16:38:49
35 // End 35 // End