[PATCH 1/3] asm-generic/atomic.h: ARCH_HAS_ATOMIC_OR -> CONFIG_ARCH_HAS_ATOMIC_OR

[Vineet Gupta]

Since this is not backed by a Kconfig option, remove CONFIG_ prefix

Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: linux-arch@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
---
 include/asm-generic/atomic.h | 2 +-
 include/linux/atomic.h       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 1973ad2b13f4..1a1cdab6e702 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -104,7 +104,7 @@ ATOMIC_OP(and, &)
 #endif
 
 #ifndef atomic_set_mask
-#define CONFIG_ARCH_HAS_ATOMIC_OR
+#define ARCH_HAS_ATOMIC_OR
 ATOMIC_OP(or, |)
 #define atomic_set_mask(i, v)	atomic_or((i), (v))
 #endif
diff --git a/include/linux/atomic.h b/include/linux/atomic.h
index 5b08a8540ecf..195881eec33e 100644
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -111,7 +111,7 @@ static inline int atomic_dec_if_positive(atomic_t *v)
 }
 #endif
 
-#ifndef CONFIG_ARCH_HAS_ATOMIC_OR
+#ifndef ARCH_HAS_ATOMIC_OR
 static inline void atomic_or(int i, atomic_t *v)
 {
 	int old;
@@ -122,7 +122,7 @@ static inline void atomic_or(int i, atomic_t *v)
 		new = old | i;
 	} while (atomic_cmpxchg(v, old, new) != old);
 }
-#endif /* #ifndef CONFIG_ARCH_HAS_ATOMIC_OR */
+#endif /* #ifndef ARCH_HAS_ATOMIC_OR */
 
 #include <asm-generic/atomic-long.h>
 #ifdef CONFIG_GENERIC_ATOMIC64
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/