From f3e9b58b436ecda90aecaf83e9b3a62f9e0927c7 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 8 Jul 2010 10:59:59 +0100
Subject: [PATCH] --- yaml --- r: 201477 b: refs/heads/master c:
 c58bbd39f876955be6e072748fdfe2b671f9d939 h: refs/heads/master i:   201475:
 53d9da1a5449d4ff9ea2ab31cfc2976259f02042 v: v3

---
 [refs]                    | 2 +-
 trunk/lib/atomic64_test.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4fb71ea70e2..0fd3a274f38a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4708ac49305bbcd511600d4af71a4c6dca15af65
+refs/heads/master: c58bbd39f876955be6e072748fdfe2b671f9d939
diff --git a/trunk/lib/atomic64_test.c b/trunk/lib/atomic64_test.c
index 250ed11d3ed2..44524cc8c32a 100644
--- a/trunk/lib/atomic64_test.c
+++ b/trunk/lib/atomic64_test.c
@@ -114,7 +114,7 @@ static __init int test_atomic64(void)
 	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_S390) || defined(_ASM_GENERIC_ATOMIC64_H) || defined(CONFIG_ARM)
 	INIT(onestwos);
 	BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
 	r -= one;