Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Mon, 9 Jan 2012 21:08:28 +0000 (13:08 -0800)]
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Remove irqsafe_cpu_xxx variants

Fix up conflict in arch/x86/include/asm/percpu.h due to clash with
cebef5beed3d ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()")
which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.

1  2 
arch/x86/include/asm/percpu.h
include/linux/netdevice.h
include/net/snmp.h
mm/slub.c
net/caif/caif_dev.c

@@@ -462,9 -446,8 +443,8 @@@ do {                                                                       
        __ret;                                                          \
  })
  
 -#define __this_cpu_cmpxchg_double_4(pcp1, pcp2, o1, o2, n1, n2)               percpu_cmpxchg8b_double(pcp1, o1, o2, n1, n2)
 -#define this_cpu_cmpxchg_double_4(pcp1, pcp2, o1, o2, n1, n2)         percpu_cmpxchg8b_double(pcp1, o1, o2, n1, n2)
 +#define __this_cpu_cmpxchg_double_4   percpu_cmpxchg8b_double
 +#define this_cpu_cmpxchg_double_4     percpu_cmpxchg8b_double
- #define irqsafe_cpu_cmpxchg_double_4  percpu_cmpxchg8b_double
  #endif /* CONFIG_X86_CMPXCHG64 */
  
  /*
        __ret;                                                          \
  })
  
 -#define __this_cpu_cmpxchg_double_8(pcp1, pcp2, o1, o2, n1, n2)               percpu_cmpxchg16b_double(pcp1, o1, o2, n1, n2)
 -#define this_cpu_cmpxchg_double_8(pcp1, pcp2, o1, o2, n1, n2)         percpu_cmpxchg16b_double(pcp1, o1, o2, n1, n2)
 +#define __this_cpu_cmpxchg_double_8   percpu_cmpxchg16b_double
 +#define this_cpu_cmpxchg_double_8     percpu_cmpxchg16b_double
- #define irqsafe_cpu_cmpxchg_double_8  percpu_cmpxchg16b_double
  
  #endif
  
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge
Simple merge