commit 56d1defe0bbddaa97d6e74b51490904130fd4f1d
author Peter Zijlstra <peterz@infradead.org> Wed Jul 15 15:47:25 2015 +0200
committer Thomas Gleixner <tglx@linutronix.de> Mon Jul 27 14:06:21 2015 +0200
tree 59a3495e8bd5b2c4b9388d64bcfd06ee6b5e58b8
parent cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f

atomic: Prepare generic atomic implementation for logic ops

Clean up the #ifdef guards a bit to prepare for architectures to
supply their own logic ops.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

include/asm-generic/atomic.h

diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 1973ad2..92947e0 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -98,14 +98,22 @@
 ATOMIC_OP_RETURN(sub, -)
 #endif
 
-#ifndef atomic_clear_mask
+#ifndef atomic_and
 ATOMIC_OP(and, &)
+#endif
+
+#ifndef atomic_clear_mask
 #define atomic_clear_mask(i, v) atomic_and(~(i), (v))
 #endif
 
-#ifndef atomic_set_mask
+#ifndef atomic_or
+#ifndef CONFIG_ARCH_HAS_ATOMIC_OR
 #define CONFIG_ARCH_HAS_ATOMIC_OR
+#endif
 ATOMIC_OP(or, |)
+#endif
+
+#ifndef atomic_set_mask
 #define atomic_set_mask(i, v)	atomic_or((i), (v))
 #endif