summaryrefslogtreecommitdiffstats
path: root/include/asm-frv
diff options
context:
space:
mode:
authorChase Venters <chase.venters@clientec.com>2006-07-08 11:10:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-12 12:56:45 -0700
commitf6dc8c5b8e04ce28720155383e971561a23899d5 (patch)
treedf590e4e096ac332a7d95ef96275bebd57ce70c9 /include/asm-frv
parent0f74964627e0ece4ac8da0e2cd01906ec322b4fe (diff)
downloadop-kernel-dev-f6dc8c5b8e04ce28720155383e971561a23899d5.zip
op-kernel-dev-f6dc8c5b8e04ce28720155383e971561a23899d5.tar.gz
[PATCH] Make cpu_relax() imply barrier() on all arches
During the recent discussion of taking 'volatile' off of the spinlock, I noticed that while most arches #define cpu_relax() such that it implies barrier(), some arches define cpu_relax() to be empty. This patch changes the definition of cpu_relax() for frv, h8300, m68knommu, sh, sh64, v850 and xtensa from an empty while(0) to the compiler barrier(). Signed-off-by: Chase Venters <chase.venters@clientec.com> Acked-by: Arjan van de Ven <arjan@Linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-frv')
-rw-r--r--include/asm-frv/processor.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h
index 1c4dba1..3744f2e 100644
--- a/include/asm-frv/processor.h
+++ b/include/asm-frv/processor.h
@@ -21,6 +21,7 @@
*/
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
+#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/sections.h>
#include <asm/segment.h>
@@ -139,7 +140,7 @@ unsigned long get_wchan(struct task_struct *p);
extern struct task_struct *alloc_task_struct(void);
extern void free_task_struct(struct task_struct *p);
-#define cpu_relax() do { } while (0)
+#define cpu_relax() barrier()
/* data cache prefetch */
#define ARCH_HAS_PREFETCH
OpenPOWER on IntegriCloud