Changeset 27605


Ignore:
Timestamp:
2011-07-13T17:01:18+02:00 (5 years ago)
Author:
nbd
Message:

mac80211: fix compile errors because of duplicate atomic64 implementations (#9690)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/022-atomic64_backport.patch

    r27572 r27605  
    3535--- /dev/null 
    3636+++ b/compat/compat_atomic.c 
    37 @@ -0,0 +1,29 @@ 
     37@@ -0,0 +1,33 @@ 
    3838+#include <linux/spinlock.h> 
    3939+#include <linux/module.h> 
     40+ 
     41+#if !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64)) 
    4042+ 
    4143+static DEFINE_SPINLOCK(lock); 
     
    6567+EXPORT_SYMBOL(atomic64_add_return); 
    6668+ 
     69+#endif 
     70+ 
    6771--- a/include/linux/compat-3.1.h 
    6872+++ b/include/linux/compat-3.1.h 
     
    7983+#include <asm/atomic.h> 
    8084+ 
    81 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT) 
     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)) 
    8286+#include <asm-generic/atomic64.h> 
    8387+#endif 
Note: See TracChangeset for help on using the changeset viewer.