From e36a7ef3135d1accb9d94e3485a12284be583213 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Mon, 21 Jun 2010 15:29:03 +0100
Subject: [PATCH] --- yaml --- r: 200795 b: refs/heads/master c:
 534be1d5a2da940ecc5e528992ea4ace8658157a h: refs/heads/master i:   200793:
 d38cbd50fd43d2b812ba0a05e9d1fb3ee8ef5763   200791:
 05b373513efe36bb00ab76267abd6a9b5e811e10 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/include/asm/processor.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fcea526629d9..1c0774b24e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc9897df72ddea33762f9d24ecaa2b23ef0ad1b4
+refs/heads/master: 534be1d5a2da940ecc5e528992ea4ace8658157a
diff --git a/trunk/arch/arm/include/asm/processor.h b/trunk/arch/arm/include/asm/processor.h
index 6a89567ffc5b..7bed3daf83b8 100644
--- a/trunk/arch/arm/include/asm/processor.h
+++ b/trunk/arch/arm/include/asm/processor.h
@@ -91,7 +91,11 @@ extern void release_thread(struct task_struct *);
 
 unsigned long get_wchan(struct task_struct *p);
 
+#if __LINUX_ARM_ARCH__ == 6
+#define cpu_relax()			smp_mb()
+#else
 #define cpu_relax()			barrier()
+#endif
 
 /*
  * Create a new kernel thread