X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=include%2Fasm-generic%2Fatomic.h;h=d4d7e337fdcb5d7bda73656c1e8b66fee6ff2cc3;hb=acceba598eda9817bc187f3a683a2d2ee7e7fbc7;hp=1973ad2b13f4dd80c750e4ff5c71d2e1510c4ff8;hpb=d0bffab0439fb7edaee09677b636eef5991e8b80;p=cascardo%2Flinux.git

diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 1973ad2b13f4..d4d7e337fdcb 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -98,15 +98,16 @@ ATOMIC_OP_RETURN(add, +)
 ATOMIC_OP_RETURN(sub, -)
 #endif
 
-#ifndef atomic_clear_mask
+#ifndef atomic_and
 ATOMIC_OP(and, &)
-#define atomic_clear_mask(i, v) atomic_and(~(i), (v))
 #endif
 
-#ifndef atomic_set_mask
-#define CONFIG_ARCH_HAS_ATOMIC_OR
+#ifndef atomic_or
 ATOMIC_OP(or, |)
-#define atomic_set_mask(i, v)	atomic_or((i), (v))
+#endif
+
+#ifndef atomic_xor
+ATOMIC_OP(xor, ^)
 #endif
 
 #undef ATOMIC_OP_RETURN