linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h
index 3744f2e..5228c18 100644 (file)
--- a/include/asm-frv/processor.h
+++ b/include/asm-frv/processor.h
@@ -12,6 +12,7 @@
 #ifndef _ASM_PROCESSOR_H
 #define _ASM_PROCESSOR_H
 
+#include <linux/config.h>
 #include <asm/mem-layout.h>
 
 #ifndef __ASSEMBLY__
@@ -21,7 +22,6 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
-#include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <asm/sections.h>
 #include <asm/segment.h>
@@ -140,7 +140,7 @@ unsigned long get_wchan(struct task_struct *p);
 extern struct task_struct *alloc_task_struct(void);
 extern void free_task_struct(struct task_struct *p);
 
-#define cpu_relax()    barrier()
+#define cpu_relax()    do { } while (0)
 
 /* data cache prefetch */
 #define ARCH_HAS_PREFETCH