ARM: Use generic assembly nop and barrier code for armv6

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/arch/arch-arm.h b/arch/arch-arm.h
index 658b6884e6cf57a5da054a4936c0425438caadc4..7cd9502eae350a4e435f8acb8b991c36e4d077af 100644 (file)
--- a/arch/arch-arm.h
+++ b/arch/arch-arm.h
@@ -18,7 +18,9 @@
 #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")