Module Name:    src
Committed By:   skrll
Date:           Tue Sep 29 18:13:29 UTC 2020

Modified Files:
        src/sys/arch/arm/include: cpufunc.h

Log Message:
Fix RPI (armv6) build


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/arm/include/cpufunc.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/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.83 src/sys/arch/arm/include/cpufunc.h:1.84
--- src/sys/arch/arm/include/cpufunc.h:1.83	Sat Sep 26 12:58:22 2020
+++ src/sys/arch/arm/include/cpufunc.h	Tue Sep 29 18:13:29 2020
@@ -44,6 +44,7 @@
 
 #define	isb()		__asm __volatile("isb" : : : "memory")
 
+#ifdef _ARM_ARCH_7
 /*
  * Options for DMB and DSB:
  *	oshld	Outer Shareable, load
@@ -61,6 +62,14 @@
  */
 #define	dsb(opt)	__asm __volatile("dsb " __STRING(opt) : : : "memory")
 #define	dmb(opt)	__asm __volatile("dmb " __STRING(opt) : : : "memory")
+#else
+
+#define dsb(opt)	\
+	__asm __volatile("mcr p15, 0, %0, c7, c10, 4" :: "r" (0) : "memory")
+#define dmb(opt)	\
+	__asm __volatile("mcr p15, 0, %0, c7, c10, 5" :: "r" (0) : "memory")
+
+#endif
 
 #ifdef __arm__
 

Reply via email to