aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-11-21 21:40:26 +0000
committerNicolas Thill <nico@openwrt.org>2011-11-21 21:40:26 +0000
commitc389cc199560cb0c2cd3f66b2ed8a518f6bfcb82 (patch)
tree189ad1fc11b0bec90471b42948954c25e2ec1d7c /package
parent3361c4d1bffd1b2b759a311d5e6702ffbfed413d (diff)
downloadupstream-c389cc199560cb0c2cd3f66b2ed8a518f6bfcb82.tar.gz
upstream-c389cc199560cb0c2cd3f66b2ed8a518f6bfcb82.tar.bz2
upstream-c389cc199560cb0c2cd3f66b2ed8a518f6bfcb82.zip
package/mac80211: fix atomic64 issues on x86 / uml
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29289 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/022-atomic64_backport.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch
index ab77f76ad0..673b7c336a 100644
--- a/package/mac80211/patches/022-atomic64_backport.patch
+++ b/package/mac80211/patches/022-atomic64_backport.patch
@@ -38,7 +38,7 @@
+#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))
++#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && (defined(CONFIG_UML) || defined(CONFIG_X86))) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
+
+static DEFINE_SPINLOCK(lock);
+