X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-m68k%2Fatomic.h;h=a4a84d5c65d50eff5cfeca8239a8c6bb16cf71c1;hb=45bfe98bd790b5ded00462cd582effcfb42263cc;hp=e3c962eeabf3d37871d24e87638fcc8005bf3048;hpb=a9931a6e37c09f6b76a9fa0cbd777c335548692b;p=linux-2.6

diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h
index e3c962eeab..a4a84d5c65 100644
--- a/include/asm-m68k/atomic.h
+++ b/include/asm-m68k/atomic.h
@@ -140,6 +140,7 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
 }
 
 #define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))
+#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
 
 #define atomic_add_unless(v, a, u)				\
 ({								\
@@ -157,4 +158,5 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
+#include <asm-generic/atomic.h>
 #endif /* __ARCH_M68K_ATOMIC __ */