[src/trunk]: src/sys/arch/arm/include Fix ARMv7 checks

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58e4c6667f7f
branches:  trunk
changeset: 329849:58e4c6667f7f
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Jun 12 08:50:52 2014 +0000

description:
Fix ARMv7 checks

_ARM_ARCH_7 && !_ARM_ARCH_6 never be true.

diffstat:

 sys/arch/arm/include/mutex.h  |  6 +++---
 sys/arch/arm/include/rwlock.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a1888de94dd3 -r 58e4c6667f7f sys/arch/arm/include/mutex.h
--- a/sys/arch/arm/include/mutex.h      Thu Jun 12 07:42:46 2014 +0000
+++ b/sys/arch/arm/include/mutex.h      Thu Jun 12 08:50:52 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.15 2014/06/12 06:28:09 ozaki-r Exp $       */
+/*     $NetBSD: mutex.h,v 1.16 2014/06/12 08:50:52 ozaki-r Exp $       */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
  * interrupts, not multiple processors.
  */
 #ifdef MULTIPROCESSOR
-#if defined(_ARM_ARCH_7) && !defined(_ARM_ARCH_6)
+#ifdef _ARM_ARCH_7
 #define        MUTEX_RECEIVE(mtx)              __asm __volatile("dmb")
 #else
 #define        MUTEX_RECEIVE(mtx)              membar_consumer()
@@ -102,7 +102,7 @@
  * MUTEX_GIVE: no memory barrier required; same reason.
  */
 #ifdef MULTIPROCESSOR
-#if defined(_ARM_ARCH_7) && !defined(_ARM_ARCH_6)
+#ifdef _ARM_ARCH_7
 #define        MUTEX_GIVE(mtx)                 __asm __volatile("dsb")
 #else
 #define        MUTEX_GIVE(mtx)                 membar_producer()
diff -r a1888de94dd3 -r 58e4c6667f7f sys/arch/arm/include/rwlock.h
--- a/sys/arch/arm/include/rwlock.h     Thu Jun 12 07:42:46 2014 +0000
+++ b/sys/arch/arm/include/rwlock.h     Thu Jun 12 08:50:52 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rwlock.h,v 1.7 2014/03/28 21:40:53 matt Exp $  */
+/*     $NetBSD: rwlock.h,v 1.8 2014/06/12 08:50:52 ozaki-r Exp $       */
 
 /*-
  * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #define        __HAVE_SIMPLE_RW_LOCKS          1
 
 #ifdef MULTIPROCESSOR
-#if defined(_ARM_ARCH_7) && !defined(_ARM_ARCH_6)
+#ifdef _ARM_ARCH_7
 #define        RW_RECEIVE(rw)                  __asm __volatile("dmb")
 #define        RW_GIVE(rw)                     __asm __volatile("dsb")
 #else