diff --git a/[refs] b/[refs]
index c2b70243c287..813e438d924d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1413357d924792e2e332dcb6b712a7fb2a5fb25
+refs/heads/master: 007d08678eb87478b65b3f229960c81dd7c7b8f3
diff --git a/trunk/lib/atomic64_test.c b/trunk/lib/atomic64_test.c
index 9087d71537dd..250ed11d3ed2 100644
--- a/trunk/lib/atomic64_test.c
+++ b/trunk/lib/atomic64_test.c
@@ -113,7 +113,8 @@ static __init int test_atomic64(void)
 	r += one;
 	BUG_ON(v.counter != r);
 
-#if defined(CONFIG_X86) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(_ASM_GENERIC_ATOMIC64_H)
+#if defined(CONFIG_X86) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
+    defined(CONFIG_S390) || defined(_ASM_GENERIC_ATOMIC64_H)
 	INIT(onestwos);
 	BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
 	r -= one;