aboutsummaryrefslogtreecommitdiffstats
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
commitaca5063d4e4599d0ee657a6045284b80684f0c38 (patch)
tree20925f7d0a41a7f4e0cec49496be7fc45f937feb
parent718907b661cae8d684c19ab8c9fe51bd8b8d75d6 (diff)
downloadupstream-aca5063d4e4599d0ee657a6045284b80684f0c38.tar.gz
upstream-aca5063d4e4599d0ee657a6045284b80684f0c38.tar.bz2
upstream-aca5063d4e4599d0ee657a6045284b80684f0c38.zip
package/mac80211: fix atomic64 issues on x86 / uml
SVN-Revision: 29289
-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);
+