From c6b7af3e416a2443cd89fe1a8d4c45bd182bf585 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 31 May 2014 15:24:18 +0200 Subject: [PATCH] backports: add smp_mb__after_atomic() smp_mb__after_clear_bit() was renamed to smp_mb__after_atomic() in more recent kernel version, this patch adds compatibility for older kernel versions. In addition it also removes a useless include of asm/atomic.h which would include this same file. Signed-off-by: Hauke Mehrtens --- backport/backport-include/asm/atomic.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backport/backport-include/asm/atomic.h b/backport/backport-include/asm/atomic.h index 1dc93a36a3a7..c2a46d221327 100644 --- a/backport/backport-include/asm/atomic.h +++ b/backport/backport-include/asm/atomic.h @@ -10,11 +10,13 @@ * asm-generic/atomic64_t. * Detect and handle this here. */ -#include - #if (!defined(ATOMIC64_INIT) && !defined(CONFIG_X86) && !(defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))) #include #endif #endif +#ifndef smp_mb__after_atomic +#define smp_mb__after_atomic smp_mb__after_clear_bit +#endif + #endif /* __BACKPORT_ASM_ATOMIC_H */ -- 2.30.2