From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 14:02:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 812BE1065670;
	Sat,  3 Mar 2012 14:02:34 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CB708FC0A;
	Sat,  3 Mar 2012 14:02:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q23E2Yfr085084;
	Sat, 3 Mar 2012 14:02:34 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23E2YYo085082;
	Sat, 3 Mar 2012 14:02:34 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201203031402.q23E2YYo085082@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 3 Mar 2012 14:02:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232462 - projects/armv6/sys/arm/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 14:02:34 -0000

Author: cognet
Date: Sat Mar  3 14:02:34 2012
New Revision: 232462
URL: http://svn.freebsd.org/changeset/base/232462

Log:
  Grrr, we can't use dmb for armv6.
  Of course, our toolchain is too ancient to support armv7, so we have to use
  this for armv7 userland, as well.

Modified:
  projects/armv6/sys/arm/include/atomic.h

Modified: projects/armv6/sys/arm/include/atomic.h
==============================================================================
--- projects/armv6/sys/arm/include/atomic.h	Sat Mar  3 13:51:51 2012	(r232461)
+++ projects/armv6/sys/arm/include/atomic.h	Sat Mar  3 14:02:34 2012	(r232462)
@@ -67,7 +67,11 @@ static __inline void
 __do_dmb(void)
 {
 
+#if ARM_ARCH_7A
 	__asm __volatile("dmb" : : : "memory");
+#else
+	__asm __volatile("mcr p15, 0, r0, c7, c10, 5" : : : "memory");
+#endif
 }
 
 #define	ATOMIC_ACQ_REL(NAME, WIDTH)					\