diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-27 17:37:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-27 17:37:58 -0700 |
| commit | 356d71e00d278d865f8c7f68adebd6ce4698a7e2 (patch) | |
| tree | 8cb2dabf7440b56c6dee76b4253210c6b603b98e /arch/arm/include/asm/processor.h | |
| parent | df453700e8d81b1bdafdf684365ee2b9431fb702 (diff) | |
| parent | 1a9df9e29c2afecf6e3089442d429b377279ca3c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/include/asm/processor.h')
| -rw-r--r-- | arch/arm/include/asm/processor.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 120f4c9bbfde..57fe73ea0f72 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -89,7 +89,11 @@ extern void release_thread(struct task_struct *); unsigned long get_wchan(struct task_struct *p); #if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327) -#define cpu_relax() smp_mb() +#define cpu_relax() \ + do { \ + smp_mb(); \ + __asm__ __volatile__("nop; nop; nop; nop; nop; nop; nop; nop; nop; nop;"); \ + } while (0) #else #define cpu_relax() barrier() #endif |