Merge branch 'linux-2.6' into for-linus

[linux-2.6-omap-h63xx.git] / include / asm-sh64 / processor.h

diff --git a/include/asm-sh64/processor.h b/include/asm-sh64/processor.h
index 1bf252dad8249e5d7f3078dde23f440729d59fad..eb2bee4b47b95e341389ad6cc48845945e0ad28f 100644 (file)
--- a/include/asm-sh64/processor.h
+++ b/include/asm-sh64/processor.h
@@ -22,6 +22,7 @@
 #include <asm/cache.h>
 #include <asm/registers.h>
 #include <linux/threads.h>
+#include <linux/compiler.h>
 
 /*
  * Default implementation of macro that returns current
@@ -279,7 +280,7 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  ((tsk)->thread.pc)
 #define KSTK_ESP(tsk)  ((tsk)->thread.sp)
 
-#define cpu_relax()    do { } while (0)
+#define cpu_relax()    barrier()
 
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_SH64_PROCESSOR_H */