svn commit: r265861 - in head/sys: arm/include modules

[Ian Lepore]

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).