X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-arm.h;h=7cd9502eae350a4e435f8acb8b991c36e4d077af;hb=93782cbbd8c8ab46bdc1f18b8a99c740ae6954e5;hp=1b590f114b563e675924c289265ce022fc3fd205;hpb=a1ea676e7a0ffc73fa5384ddb189ced9edd4b0bf;p=fio.git

diff --git a/arch/arch-arm.h b/arch/arch-arm.h
index 1b590f11..7cd9502e 100644
--- a/arch/arch-arm.h
+++ b/arch/arch-arm.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_ARM_H
 #define ARCH_ARM_H
 
-#define ARCH	(arch_arm)
+#define FIO_ARCH	(arch_arm)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		314
@@ -18,10 +18,16 @@
 #define __NR_sys_vmsplice	343
 #endif
 
-#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)
+#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) \
+	|| defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__) \
+	|| defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
 #define nop             __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t")
 #define read_barrier()	__asm__ __volatile__ ("" : : : "memory")
 #define write_barrier()	__asm__ __volatile__ ("" : : : "memory")
+#elif defined(__ARM_ARCH_7A__)
+#define	nop		__asm__ __volatile__ ("nop")
+#define read_barrier()	__sync_synchronize()
+#define write_barrier()	__sync_synchronize()
 #endif
 
 #endif