KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: fix compile errors because of duplicate atomic64 implementations (#9690)

Browse source 
SVN-Revision: 27605
This commit is contained in:
Felix Fietkau 2011-07-13 15:01:18 +00:00
parent 930485561c
commit 9ef09af36d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/mac80211/patches/022-atomic64_backport.patch
View file

@ -34,10 +34,12 @@
#endif /* LINUX_26_31_COMPAT_H */ #endif /* LINUX_26_31_COMPAT_H */
--- /dev/null --- /dev/null
+++ b/compat/compat_atomic.c +++ b/compat/compat_atomic.c
@@ -0,0 +1,29 @@ @@ -0,0 +1,33 @@
+#include <linux/spinlock.h> +#include <linux/spinlock.h>
+#include <linux/module.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); +static DEFINE_SPINLOCK(lock);
+ +
+long long atomic64_read(const atomic64_t *v) +long long atomic64_read(const atomic64_t *v)
@ -64,6 +66,8 @@
+} +}
+EXPORT_SYMBOL(atomic64_add_return); +EXPORT_SYMBOL(atomic64_add_return);
+ +
+#endif
+
--- a/include/linux/compat-3.1.h --- a/include/linux/compat-3.1.h
+++ b/include/linux/compat-3.1.h +++ b/include/linux/compat-3.1.h
@@ -24,6 +24,18 @@ @@ -24,6 +24,18 @@
@ -78,7 +82,7 @@
+ */ + */
+#include <asm/atomic.h> +#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> +#include <asm-generic/atomic64.h>
+#endif +#endif
+ +