diff --git a/[refs] b/[refs] index af8a4782ca12..6fb420214753 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7e926abc3adfbd2e5e20d2b46177adb4e313915 +refs/heads/master: 8f4f202b335144bf5be5c9e5b1bc9477ecdae958 diff --git a/trunk/lib/atomic64_test.c b/trunk/lib/atomic64_test.c index 4ff649e46bad..0effcacbebda 100644 --- a/trunk/lib/atomic64_test.c +++ b/trunk/lib/atomic64_test.c @@ -112,6 +112,7 @@ static __init int test_atomic64(void) r += one; BUG_ON(v.counter != r); +#if defined(CONFIG_X86_32) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(_ASM_GENERIC_ATOMIC64_H) INIT(onestwos); BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1)); r -= one; @@ -124,6 +125,9 @@ static __init int 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 add it to the IF above +#endif INIT(onestwos); BUG_ON(atomic64_inc_not_zero(&v));