From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 31 May 2014 13:24:18 +0000 (+0200)
Subject: backports: add smp_mb__after_atomic()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6b7af3e416a2443cd89fe1a8d4c45bd182bf585;p=openwrt%2Fstaging%2Fblogic.git

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 <hauke@hauke-m.de>
---

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 <asm/atomic.h>
-
 #if (!defined(ATOMIC64_INIT) && !defined(CONFIG_X86) && !(defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64)))
 #include <asm-generic/atomic64.h>
 #endif
 #endif
 
+#ifndef smp_mb__after_atomic
+#define smp_mb__after_atomic smp_mb__after_clear_bit
+#endif
+
 #endif /* __BACKPORT_ASM_ATOMIC_H */