Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed

1 files changed, 34 insertions, 4 deletions

diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c
index 123481814320..46042901130f 100644
--- a/lib/atomic64_test.c
+++ b/lib/atomic64_test.c
@@ -53,11 +53,25 @@ do {								\
         BUG_ON(atomic##bit##_read(&v) != r);                    \
 } while (0)
 
+#define TEST_FETCH(bit, op, c_op, val)                          \
+do {                                                            \
+        atomic##bit##_set(&v, v0);                              \
+        r = v0;                                                 \
+        r c_op val;                                             \
+        BUG_ON(atomic##bit##_##op(val, &v) != v0);              \
+        BUG_ON(atomic##bit##_read(&v) != r);                    \
+} while (0)
+
 #define RETURN_FAMILY_TEST(bit, op, c_op, val)                  \
 do {                                                            \
         FAMILY_TEST(TEST_RETURN, bit, op, c_op, val);           \
 } while (0)
 
+#define FETCH_FAMILY_TEST(bit, op, c_op, val)                   \
+do {                                                            \
+        FAMILY_TEST(TEST_FETCH, bit, op, c_op, val);            \
+} while (0)
+
 #define TEST_ARGS(bit, op, init, ret, expect, args...)          \
 do {                                                            \
         atomic##bit##_set(&v, init);                            \
@@ -114,6 +128,16 @@ static __init void test_atomic(void)
         RETURN_FAMILY_TEST(, sub_return, -=, onestwos);
         RETURN_FAMILY_TEST(, sub_return, -=, -one);
 
+        FETCH_FAMILY_TEST(, fetch_add, +=, onestwos);
+        FETCH_FAMILY_TEST(, fetch_add, +=, -one);
+        FETCH_FAMILY_TEST(, fetch_sub, -=, onestwos);
+        FETCH_FAMILY_TEST(, fetch_sub, -=, -one);
+
+        FETCH_FAMILY_TEST(, fetch_or,  |=, v1);
+        FETCH_FAMILY_TEST(, fetch_and, &=, v1);
+        FETCH_FAMILY_TEST(, fetch_andnot, &= ~, v1);
+        FETCH_FAMILY_TEST(, fetch_xor, ^=, v1);
+
         INC_RETURN_FAMILY_TEST(, v0);
         DEC_RETURN_FAMILY_TEST(, v0);
 
@@ -154,6 +178,16 @@ static __init void test_atomic64(void)
         RETURN_FAMILY_TEST(64, sub_return, -=, onestwos);
         RETURN_FAMILY_TEST(64, sub_return, -=, -one);
 
+        FETCH_FAMILY_TEST(64, fetch_add, +=, onestwos);
+        FETCH_FAMILY_TEST(64, fetch_add, +=, -one);
+        FETCH_FAMILY_TEST(64, fetch_sub, -=, onestwos);
+        FETCH_FAMILY_TEST(64, fetch_sub, -=, -one);
+
+        FETCH_FAMILY_TEST(64, fetch_or,  |=, v1);
+        FETCH_FAMILY_TEST(64, fetch_and, &=, v1);
+        FETCH_FAMILY_TEST(64, fetch_andnot, &= ~, v1);
+        FETCH_FAMILY_TEST(64, fetch_xor, ^=, v1);
+
         INIT(v0);
         atomic64_inc(&v);
         r += one;
@@ -179,7 +213,6 @@ static __init void test_atomic64(void)
         r += one;
         BUG_ON(v.counter != r);
 
-#ifdef CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         INIT(onestwos);
         BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
         r -= one;
@@ -192,9 +225,6 @@ static __init void test_atomic64(void)
         INIT(-one);
         BUG_ON(atomic64_dec_if_positive(&v) != (-one - one));
         BUG_ON(v.counter != r);
-#else
-#warning Please implement atomic64_dec_if_positive for your architecture and select the above Kconfig symbol
-#endif
 
         INIT(onestwos);
         BUG_ON(!atomic64_inc_not_zero(&v));