aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-13 15:01:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-13 15:01:18 +0000
commit9ef09af36d37390fbc3d916ac3bfeb333c46df41 (patch)
tree0175beef1a0f122c21c98ec5261010dabf951406
parent930485561ce9557416ff78681fed907c15a89351 (diff)
downloadupstream-9ef09af36d37390fbc3d916ac3bfeb333c46df41.tar.gz
upstream-9ef09af36d37390fbc3d916ac3bfeb333c46df41.tar.bz2
upstream-9ef09af36d37390fbc3d916ac3bfeb333c46df41.zip
mac80211: fix compile errors because of duplicate atomic64 implementations (#9690)
SVN-Revision: 27605
-rw-r--r--package/mac80211/patches/022-atomic64_backport.patch8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch
index 27e2edb711..7589d73dcb 100644
--- a/package/mac80211/patches/022-atomic64_backport.patch
+++ b/package/mac80211/patches/022-atomic64_backport.patch
@@ -34,10 +34,12 @@
#endif /* LINUX_26_31_COMPAT_H */
--- /dev/null
+++ b/compat/compat_atomic.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,33 @@
+#include <linux/spinlock.h>
+#include <linux/module.h>
+
++#if !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
++
+static DEFINE_SPINLOCK(lock);
+
+long long atomic64_read(const atomic64_t *v)
@@ -64,6 +66,8 @@
+}
+EXPORT_SYMBOL(atomic64_add_return);
+
++#endif
++
--- a/include/linux/compat-3.1.h
+++ b/include/linux/compat-3.1.h
@@ -24,6 +24,18 @@
@@ -78,7 +82,7 @@
+ */
+#include <asm/atomic.h>
+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT) && !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
+#include <asm-generic/atomic64.h>
+#endif
+