X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-h8300%2Fprocessor.h;h=49fc886a623278249302edf3c169c883526e8313;hb=dd9cd6d4351076c78bb8c0f9146d1904b481fdbb;hp=c7e2f454b83a570b5a445b061f028705166637bb;hpb=af57d238aa2107e1b45d8dacad6e50db938f0567;p=mv-sheeva.git

diff --git a/include/asm-h8300/processor.h b/include/asm-h8300/processor.h
index c7e2f454b83..49fc886a623 100644
--- a/include/asm-h8300/processor.h
+++ b/include/asm-h8300/processor.h
@@ -17,6 +17,7 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
+#include <linux/compiler.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
@@ -77,7 +78,7 @@ struct thread_struct {
 do {							        \
 	set_fs(USER_DS);           /* reads from user space */  \
   	(_regs)->pc = (_pc);				        \
-	(_regs)->ccr &= 0x00;	   /* clear kernel flag */      \
+	(_regs)->ccr = 0x00;	   /* clear all flags */        \
 	(_regs)->er5 = current->mm->start_data;	/* GOT base */  \
 	wrusp((unsigned long)(_usp) - sizeof(unsigned long)*3);	\
 } while(0)
@@ -129,6 +130,6 @@ unsigned long get_wchan(struct task_struct *p);
 	eip; })
 #define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->thread.usp)
 
-#define cpu_relax()    do { } while (0)
+#define cpu_relax()    barrier()
 
 #endif