linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-xtensa/processor.h b/include/asm-xtensa/processor.h
index 8b96e77..d1d72ad 100644 (file)
--- 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. */