---

yaml --- r: 155289 b: refs/heads/master c: 25ca125 h: refs/heads/master i: 155287: 826b790 v: v3
git-mirror · Jul 7, 2009 · f098875 · f098875
1 parent 44836fd
commit f098875
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c48c4d631970b70d60a4f926b0f68f194a0d559
+refs/heads/master: 25ca1251dc55673da1f3c6ddc1bf93fbb7fc83fc
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -95,6 +95,7 @@ config S390
 	select HAVE_ARCH_TRACEHOOK
 	select INIT_ALL_POSSIBLE
 	select HAVE_PERF_COUNTERS
+	select GENERIC_ATOMIC64 if !64BIT
 
 config SCHED_OMIT_FRAME_POINTER
 	bool

diff --git a/trunk/arch/s390/include/asm/atomic.h b/trunk/arch/s390/include/asm/atomic.h
@@ -268,7 +268,12 @@ static __inline__ int atomic64_add_unless(atomic64_t *v,
 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
 
 #undef __CSG_LOOP
-#endif
+
+#else /* __s390x__ */
+
+#include <asm-generic/atomic64.h>
+
+#endif /* __s390x__ */
 
 #define smp_mb__before_atomic_dec()	smp_mb()
 #define smp_mb__after_atomic_dec()	smp_mb()