[src/trunk]: src/sys/arch/aarch64/include Use <sys/common_lock.h> for !__arm__

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d0563a84238
branches:  trunk
changeset: 339092:8d0563a84238
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 26 18:27:52 2015 +0000

description:
Use <sys/common_lock.h> for !__arm__

diffstat:

 sys/arch/aarch64/include/lock.h |  95 +---------------------------------------
 1 files changed, 3 insertions(+), 92 deletions(-)

diffs (103 lines):

diff -r a362fd20033a -r 8d0563a84238 sys/arch/aarch64/include/lock.h
--- a/sys/arch/aarch64/include/lock.h   Fri Jun 26 14:40:31 2015 +0000
+++ b/sys/arch/aarch64/include/lock.h   Fri Jun 26 18:27:52 2015 +0000
@@ -1,96 +1,7 @@
-/* $NetBSD: lock.h,v 1.2 2014/08/13 19:32:35 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Machine-dependent spin lock operations.
- */
-
-#ifndef _AARCH64_LOCK_H_
-#define        _AARCH64_LOCK_H_
+/* $NetBSD: lock.h,v 1.3 2015/06/26 18:27:52 matt Exp $ */
 
 #ifdef __aarch64__
-
-static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
-{
-       return *__ptr != __SIMPLELOCK_UNLOCKED;
-}
-
-static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
-{
-       return *__ptr == __SIMPLELOCK_UNLOCKED;
-}
-
-static __inline void
-__cpu_simple_lock_clear(__cpu_simple_lock_t *__ptr)
-{
-       __atomic_clear(__ptr, __ATOMIC_RELAXED);
-}
-
-static __inline void
-__cpu_simple_lock_set(__cpu_simple_lock_t *__ptr)
-{
-       (void)__atomic_test_and_set(__ptr, __ATOMIC_RELAXED);
-}
-
-static __inline void __unused
-__cpu_simple_lock_init(__cpu_simple_lock_t *alp)
-{
-       __atomic_clear(alp, __ATOMIC_RELAXED);
-}
-
-static __inline void __unused
-__cpu_simple_lock(__cpu_simple_lock_t *alp)
-{
-       while (__atomic_test_and_set(alp, __ATOMIC_ACQUIRE)) {
-               /* do nothing */
-       }
-}
-
-static __inline int __unused
-__cpu_simple_lock_try(__cpu_simple_lock_t *alp)
-{
-       return !__atomic_test_and_set(alp, __ATOMIC_ACQUIRE);
-}
-
-static __inline void __unused
-__cpu_simple_unlock(__cpu_simple_lock_t *alp)
-{
-       __atomic_clear(alp, __ATOMIC_RELEASE);
-}
-
+# include <sys/common_lock.h>
 #elif defined(__arm__)
-
-#include <arm/lock.h>
-
+# include <arm/lock.h>
 #endif
-
-#endif /* _AARCH64_LOCK_H_ */