X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-v850%2Fprocessor.h;h=979e3467f9afc14b2a9e1db9eb33ec400c693371;hb=9ebbec27da6d7f4762b73985ac4929acf061d48b;hp=2d31308935a00ab0263feab4b75ce8be482724be;hpb=a2b421fee37d34c09bd2a14d3e9294f838c64370;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h
index 2d31308935a..979e3467f9a 100644
--- a/include/asm-v850/processor.h
+++ b/include/asm-v850/processor.h
@@ -14,11 +14,11 @@
 #ifndef __V850_PROCESSOR_H__
 #define __V850_PROCESSOR_H__
 
-#include <linux/config.h>
 #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe.  */
 #include <linux/thread_info.h>
 #endif
 
+#include <linux/compiler.h>
 #include <asm/ptrace.h>
 #include <asm/entry.h>
 
@@ -107,7 +107,7 @@ unsigned long get_wchan (struct task_struct *p);
 #define KSTK_ESP(task)	task_sp (task)
 
 
-#define cpu_relax()    ((void)0)
+#define cpu_relax()    barrier()
 
 
 #else /* __ASSEMBLY__ */