Mercurial > hg > truffle
diff src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp @ 8737:71f619500f9b
Merge
author | kevinw |
---|---|
date | Mon, 11 Mar 2013 15:37:10 +0100 |
parents | 63e54c37ac64 |
children |
line wrap: on
line diff
--- a/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Mon Mar 11 12:56:00 2013 +0000 +++ b/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Mon Mar 11 15:37:10 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2011 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,7 +26,6 @@ #ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP #define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP -#include "orderAccess_linux_zero.inline.hpp" #include "runtime/atomic.hpp" #include "runtime/os.hpp" #include "vm_version_zero.hpp"