X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-xtensa%2Fprocessor.h;fp=include%2Fasm-xtensa%2Fprocessor.h;h=d1d72ad36f08e4506460b7e1aeaeb6b1b75d337b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=8b96e77c9d829c6c2bd92fbe2c15b1616ade29f2;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-xtensa/processor.h b/include/asm-xtensa/processor.h
index 8b96e77c9..d1d72ad36 100644
--- a/include/asm-xtensa/processor.h
+++ b/include/asm-xtensa/processor.h
@@ -20,7 +20,6 @@
 #include <xtensa/config/tie.h>
 #include <xtensa/config/system.h>
 
-#include <linux/compiler.h>
 #include <asm/ptrace.h>
 #include <asm/types.h>
 #include <asm/coprocessor.h>
@@ -192,7 +191,7 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)		(task_pt_regs(tsk)->pc)
 #define KSTK_ESP(tsk)		(task_pt_regs(tsk)->areg[1])
 
-#define cpu_relax()  barrier()
+#define cpu_relax()  do { } while (0)
 
 /* Special register access. */