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

diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index eeb0f48bb..fa5bd2d88 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -9,7 +9,6 @@
 #define __ASM_SH_PROCESSOR_H
 #ifdef __KERNEL__
 
-#include <linux/compiler.h>
 #include <asm/page.h>
 #include <asm/types.h>
 #include <asm/cache.h>
@@ -264,7 +263,7 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define KSTK_ESP(tsk)  ((tsk)->thread.sp)
 
 #define cpu_sleep()	__asm__ __volatile__ ("sleep" : : : "memory")
-#define cpu_relax()	barrier()
+#define cpu_relax()	do { } while (0)
 
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_PROCESSOR_H */