X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-ppc%2Fsystem.h;h=d84a3cf4d033682b48dadecd7249b13c8b6419b9;hb=932c37c375cca25175f9b6acee4c75d7a96d985f;hp=fb49c0c49ea1078fdea6df52b55dd09a71c302dd;hpb=58cba4650a7a414eabd2b40cc9d8e45fcdf192d9;p=linux-2.6

diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index fb49c0c49e..d84a3cf4d0 100644
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -6,7 +6,6 @@
 
 #include <linux/kernel.h>
 
-#include <asm/atomic.h>
 #include <asm/hw_irq.h>
 
 /*
@@ -33,7 +32,6 @@
 #define read_barrier_depends()  do { } while(0)
 
 #define set_mb(var, value)	do { var = value; mb(); } while (0)
-#define set_wmb(var, value)	do { var = value; wmb(); } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()	mb()
@@ -171,7 +169,6 @@ xchg_u32(volatile void *p, unsigned long val)
 extern void __xchg_called_with_bad_pointer(void);
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 {