X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-xtensa%2Fsystem.h;h=ddc970847ae9e406c3a9da69e04a190c1acc7151;hb=2024da603978882d102a34d47828a205fffb338e;hp=f986170bd2a15416c5e6e94ec686f11fbb975c09;hpb=0c97f524fc16004602f97ba19c36acdcc0fb9688;p=powerpc.git

diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index f986170bd2..ddc970847a 100644
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -99,7 +99,6 @@ static inline void disable_coprocessor(int i)
 #endif
 
 #define set_mb(var, value)	do { var = value; mb(); } while (0)
-#define set_wmb(var, value)	do { var = value; wmb(); } while (0)
 
 #if !defined (__ASSEMBLY__)
 
@@ -184,8 +183,6 @@ static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
   return tmp;
 }
 
-#define tas(ptr) (xchg((ptr),1))
-
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
 /*
@@ -214,7 +211,7 @@ static inline void spill_registers(void)
 	unsigned int a0, ps;
 
 	__asm__ __volatile__ (
-		"movi	a14," __stringify (PS_EXCM_MASK) " | 1\n\t"
+		"movi	a14," __stringify (PS_EXCM_BIT) " | 1\n\t"
 		"mov	a12, a0\n\t"
 		"rsr	a13," __stringify(SAR) "\n\t"
 		"xsr	a14," __stringify(PS) "\n\t"