*** old/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp	Tue Sep 13 12:29:07 2011
--- new/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp	Tue Sep 13 12:29:07 2011

*** 20,33 ****
--- 20,33 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
! #define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
! #ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
! #define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
  
! #include "orderAccess_linux_x86.inline.hpp"
! #include "orderAccess_bsd_x86.inline.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/os.hpp"
  #include "vm_version_x86.hpp"
  
  // Implementation of class atomic

*** 183,193 ****
--- 183,193 ----
  inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
    return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
  }
  
  extern "C" {
!   // defined in linux_x86.s
!   // defined in bsd_x86.s
    jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
    void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
  }
  
  inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {

*** 216,221 ****
--- 216,221 ----
    _Atomic_move_long((volatile jlong*)&store_value, dest);
  }
  
  #endif // AMD64
  
! #endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
! #endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP