3 @@ -34,3 +34,8 @@ compat-$(CONFIG_COMPAT_KERNEL_2_6_39) +=
8 +ifndef CONFIG_GENERIC_ATOMIC64
9 + compat-y += compat_atomic.o
12 --- a/include/linux/compat-2.6.31.h
13 +++ b/include/linux/compat-2.6.31.h
14 @@ -199,6 +199,20 @@ void compat_synchronize_threaded_irq(str
15 #define list_entry_rcu(ptr, type, member) \
16 container_of(rcu_dereference(ptr), type, member)
24 +extern long long atomic64_read(const atomic64_t *v);
25 +extern long long atomic64_add_return(long long a, atomic64_t *v);
27 +#define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
32 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */
34 #endif /* LINUX_26_31_COMPAT_H */
36 +++ b/compat/compat_atomic.c
38 +#include <linux/spinlock.h>
39 +#include <linux/module.h>
41 +#if !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
43 +static DEFINE_SPINLOCK(lock);
45 +long long atomic64_read(const atomic64_t *v)
47 + unsigned long flags;
50 + spin_lock_irqsave(&lock, flags);
52 + spin_unlock_irqrestore(&lock, flags);
55 +EXPORT_SYMBOL(atomic64_read);
57 +long long atomic64_add_return(long long a, atomic64_t *v)
59 + unsigned long flags;
62 + spin_lock_irqsave(&lock, flags);
63 + val = v->counter += a;
64 + spin_unlock_irqrestore(&lock, flags);
67 +EXPORT_SYMBOL(atomic64_add_return);
71 --- a/include/linux/compat-3.1.h
72 +++ b/include/linux/compat-3.1.h
75 #define genl_dump_check_consistent(...) do {} while(0)
78 + * In many versions, several architectures do not seem to include an
79 + * atomic64_t implementation, and do not include the software emulation from
80 + * asm-generic/atomic64_t.
81 + * Detect and handle this here.
83 +#include <asm/atomic.h>
85 +#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))
86 +#include <asm-generic/atomic64.h>
89 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
91 #endif /* LINUX_3_1_COMPAT_H */