From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 21 Nov 2011 21:40:26 +0000 (+0000)
Subject: package/mac80211: fix atomic64 issues on x86 / uml
X-Git-Tag: reboot~15454
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aca5063d4e4599d0ee657a6045284b80684f0c38;p=openwrt%2Fstaging%2Fblogic.git

package/mac80211: fix atomic64 issues on x86 / uml

SVN-Revision: 29289
---

diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch
index ab77f76ad020..673b7c336a6b 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);
 +