X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sh64%2Fprocessor.h;h=1bf252dad8249e5d7f3078dde23f440729d59fad;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=eb2bee4b47b95e341389ad6cc48845945e0ad28f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-sh64/processor.h b/include/asm-sh64/processor.h
index eb2bee4b4..1bf252dad 100644
--- a/include/asm-sh64/processor.h
+++ b/include/asm-sh64/processor.h
@@ -22,7 +22,6 @@
 #include <asm/cache.h>
 #include <asm/registers.h>
 #include <linux/threads.h>
-#include <linux/compiler.h>
 
 /*
  * Default implementation of macro that returns current
@@ -280,7 +279,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()	barrier()
+#define cpu_relax()	do { } while (0)
 
 #endif	/* __ASSEMBLY__ */
 #endif /* __ASM_SH64_PROCESSOR_H */