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

diff --git a/include/asm-h8300/processor.h b/include/asm-h8300/processor.h
index 99b664aa2..c6f0a7108 100644
--- a/include/asm-h8300/processor.h
+++ b/include/asm-h8300/processor.h
@@ -17,7 +17,7 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
-#include <linux/compiler.h>
+#include <linux/config.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
@@ -130,6 +130,6 @@ unsigned long get_wchan(struct task_struct *p);
 	eip; })
 #define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->thread.usp)
 
-#define cpu_relax()    barrier()
+#define cpu_relax()    do { } while (0)
 
 #endif