diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-13 15:01:18 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-13 15:01:18 +0000 |
| commit | 3f4c3ffd6689f9aadcb9bd3b366220a318994cc7 (patch) | |
| tree | c8c7031260531a2ab3904fdbfbeca3e948c4826c /package | |
| parent | e43c7712447796c8a405984f5474584de7859b61 (diff) | |
mac80211: fix compile errors because of duplicate atomic64 implementations (#9690)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27605 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/022-atomic64_backport.patch | 8 |
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 + |