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

*** 20,31 ****
--- 20,31 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
! #define OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
! #ifndef OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
! #define OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
  
  static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
  #ifdef AMD64
    (void)memmove(to, from, count * HeapWordSize);
  #else

*** 304,309 ****
--- 304,309 ----
  #else
    pd_conjoint_oops_atomic((oop*)from, (oop*)to, count);
  #endif // AMD64
  }
  
! #endif // OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
! #endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP