From owner-svn-src-all@FreeBSD.ORG  Sun May 11 00:43:06 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D46AD1CE;
 Sun, 11 May 2014 00:43:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C1E4E20E9;
 Sun, 11 May 2014 00:43:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4B0h64M040967;
 Sun, 11 May 2014 00:43:06 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4B0h6B9040965;
 Sun, 11 May 2014 00:43:06 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201405110043.s4B0h6B9040965@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 11 May 2014 00:43:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265861 - in head/sys: arm/include modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2014 00:43:06 -0000

Author: ian
Date: Sun May 11 00:43:06 2014
New Revision: 265861
URL: http://svnweb.freebsd.org/changeset/base/265861

Log:
  Make the hardware memory and instruction barrier functions work on armv4
  and armv5 as well.

Modified:
  head/sys/arm/include/atomic.h
  head/sys/modules/Makefile

Modified: head/sys/arm/include/atomic.h
==============================================================================
--- head/sys/arm/include/atomic.h	Sat May 10 22:27:01 2014	(r265860)
+++ head/sys/arm/include/atomic.h	Sun May 11 00:43:06 2014	(r265861)
@@ -58,9 +58,9 @@
 #define dsb()  __asm __volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (0) : "memory")
 #define dmb()  __asm __volatile("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory")
 #else
-#define isb()
-#define dsb()
-#define dmb()
+#define isb()  __asm __volatile("mcr p15, 0, %0, c7, c5, 4" : : "r" (0) : "memory")
+#define dsb()  __asm __volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (0) : "memory")
+#define dmb()  dsb()
 #endif
 
 #define mb()   dmb()

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Sat May 10 22:27:01 2014	(r265860)
+++ head/sys/modules/Makefile	Sun May 11 00:43:06 2014	(r265861)
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+SUBDIR_PARALLEL=
+
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).