Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

[~andy/linux] / include / linux / atomic.h

diff --git a/include/linux/atomic.h b/include/linux/atomic.h
index 96c038e43d667ad04d15cec41841d2f2606cb816..ee456c79b0e6784cb8af04fcddbc3f354030b59f 100644 (file)
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -34,4 +34,17 @@ static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
 }
 #endif
 
+#ifndef CONFIG_ARCH_HAS_ATOMIC_OR
+static inline void atomic_or(int i, atomic_t *v)
+{
+       int old;
+       int new;
+
+       do {
+               old = atomic_read(v);
+               new = old | i;
+       } while (atomic_cmpxchg(v, old, new) != old);
+}
+#endif /* #ifndef CONFIG_ARCH_HAS_ATOMIC_OR */
+
 #endif /* _LINUX_ATOMIC_H */