linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-v850 / processor.h

diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h
index 979e346..2d31308 100644 (file)
--- 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()    barrier()
+#define cpu_relax()    ((void)0)
 
 
 #else /* __ASSEMBLY__ */