diff src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp @ 8737:71f619500f9b

Merge
author kevinw
date Mon, 11 Mar 2013 15:37:10 +0100
parents 63e54c37ac64
children 46c544b8fbfc
line wrap: on
line diff
--- a/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp	Mon Mar 11 12:56:00 2013 +0000
+++ b/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp	Mon Mar 11 15:37:10 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
 #define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
 
-#include "orderAccess_linux_sparc.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "vm_version_sparc.hpp"