From f098875eb275a3c63925cefd83f50d12f22c46fe Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 7 Jul 2009 16:37:12 +0200 Subject: [PATCH] --- yaml --- r: 155289 b: refs/heads/master c: 25ca1251dc55673da1f3c6ddc1bf93fbb7fc83fc h: refs/heads/master i: 155287: 826b790247cc983e7dd1fa6689551bbc99bb2db9 v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 1 + trunk/arch/s390/include/asm/atomic.h | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 161a438e0e11..9171d372131a 100644 --- 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 index 4cd12b5202af..f46a1b50ddee 100644 --- 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 index fca9dffcc669..c7d0abfb0f00 100644 --- 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 + +#endif /* __s390x__ */ #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb()