projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/users/willy/linux-nvme
[firefly-linux-kernel-4.4.55.git]
/
lib
/
atomic64_test.c
diff --git
a/lib/atomic64_test.c
b/lib/atomic64_test.c
index cb99b91c3a1d3af01b012fc421d69c8935733556..00bca223d1e1e6552bbdd0dd7c69fef2ff48c60d 100644
(file)
--- a/
lib/atomic64_test.c
+++ b/
lib/atomic64_test.c
@@
-114,8
+114,7
@@
static __init int test_atomic64(void)
r += one;
BUG_ON(v.counter != r);
r += one;
BUG_ON(v.counter != r);
-#if defined(CONFIG_X86) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
- defined(CONFIG_S390) || defined(_ASM_GENERIC_ATOMIC64_H) || defined(CONFIG_ARM)
+#ifdef CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
INIT(onestwos);
BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
r -= one;
INIT(onestwos);
BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
r -= one;
@@
-129,7
+128,7
@@
static __init int test_atomic64(void)
BUG_ON(atomic64_dec_if_positive(&v) != (-one - one));
BUG_ON(v.counter != r);
#else
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
+#warning Please implement atomic64_dec_if_positive for your architecture
and select the above Kconfig symbol
#endif
INIT(onestwos);
#endif
INIT(onestwos);