From 2d3b79c7747eb077b85152d0bb82304b3eff40a6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 15 Apr 2013 09:36:24 +0200 Subject: [PATCH] ARM: Use generic assembly nop and barrier code for armv6 Signed-off-by: Otavio Salvador Signed-off-by: Jens Axboe --- arch/arch-arm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arch-arm.h b/arch/arch-arm.h index 658b6884..7cd9502e 100644 --- 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") -- 2.25.1