Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

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

diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h
index 5228c18b7f78c69929b9598d0cdd01276fdf5510..3744f2e47f48fcd92fe03e9e89b550b841736e6d 100644 (file)
--- a/include/asm-frv/processor.h
+++ b/include/asm-frv/processor.h
@@ -12,7 +12,6 @@
 #ifndef _ASM_PROCESSOR_H
 #define _ASM_PROCESSOR_H
 
-#include <linux/config.h>
 #include <asm/mem-layout.h>
 
 #ifndef __ASSEMBLY__
@@ -22,6 +21,7 @@
  */
 #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()    do { } while (0)
+#define cpu_relax()    barrier()
 
 /* data cache prefetch */
 #define ARCH_HAS_PREFETCH