Module Name: src
Committed By: ozaki-r
Date: Thu Jun 12 08:50:52 UTC 2014
Modified Files:
src/sys/arch/arm/include: mutex.h rwlock.h
Log Message:
Fix ARMv7 checks
_ARM_ARCH_7 && !_ARM_ARCH_6 never be true.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/rwlock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/mutex.h
diff -u src/sys/arch/arm/include/mutex.h:1.15 src/sys/arch/arm/include/mutex.h:1.16
--- src/sys/arch/arm/include/mutex.h:1.15 Thu Jun 12 06:28:09 2014
+++ src/sys/arch/arm/include/mutex.h Thu Jun 12 08:50:52 2014
@@ -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 @@ struct kmutex {
* 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 @@ struct kmutex {
* 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()
Index: src/sys/arch/arm/include/rwlock.h
diff -u src/sys/arch/arm/include/rwlock.h:1.7 src/sys/arch/arm/include/rwlock.h:1.8
--- src/sys/arch/arm/include/rwlock.h:1.7 Fri Mar 28 21:40:53 2014
+++ src/sys/arch/arm/include/rwlock.h Thu Jun 12 08:50:52 2014
@@ -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 @@ struct krwlock {
#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
