Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25ca1251 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] add generic atomic64 support for 31 bit 



Performance counters need 64 bit atomic operations.
To keep the patch small we use the simple generic atomic64_t implementation.
The native implementation follows with the next kernel.

Fixes this build bug:

In file included from kernel/sched.c:42:
include/linux/perf_counter.h:427: error: expected specifier-qualifier-list before 'atomic64_t'

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2c48c4d6

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/s390/include/asm/atomic.h

+6 −1
Original line number Diff line number Diff line
@@ -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()