]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch
Merge remote-tracking branch 'origin/next' into kernel-update
[people/teissler/ipfire-2.x.git] / src / patches / compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch
1 diff -Naur compat-wireless-3.2.5-1.org/compat/compat_atomic.c compat-wireless-3.2.5-1/compat/compat_atomic.c
2 --- compat-wireless-3.2.5-1.org/compat/compat_atomic.c 2012-02-07 04:45:51.000000000 +0100
3 +++ compat-wireless-3.2.5-1/compat/compat_atomic.c 2012-02-18 15:39:42.000000000 +0100
4 @@ -3,6 +3,8 @@
5
6 #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))
7
8 +#include <asm-generic/atomic64.h>
9 +
10 static DEFINE_SPINLOCK(lock);
11
12 long long atomic64_read(const atomic64_t *v)
13 diff -Naur compat-wireless-3.2.5-1.org/compat/Makefile compat-wireless-3.2.5-1/compat/Makefile
14 --- compat-wireless-3.2.5-1.org/compat/Makefile 2012-02-07 05:25:54.000000000 +0100
15 +++ compat-wireless-3.2.5-1/compat/Makefile 2012-02-18 13:35:18.000000000 +0100
16 @@ -38,3 +38,9 @@
17 cordic.o \
18 crc8.o
19
20 +
21 +ifndef CONFIG_64BIT
22 +ifndef CONFIG_GENERIC_ATOMIC64
23 + compat-y += compat_atomic.o
24 +endif
25 +endif
26 diff -Naur compat-wireless-3.2.5-1.org/net/mac80211/key.h compat-wireless-3.2.5-1/net/mac80211/key.h
27 --- compat-wireless-3.2.5-1.org/net/mac80211/key.h 2012-02-07 05:25:53.000000000 +0100
28 +++ compat-wireless-3.2.5-1/net/mac80211/key.h 2012-02-18 15:40:44.000000000 +0100
29 @@ -32,6 +32,8 @@
30
31 #define NUM_RX_DATA_QUEUES 16
32
33 +#include <asm-generic/atomic64.h>
34 +
35 struct ieee80211_local;
36 struct ieee80211_sub_if_data;
37 struct sta_info;