Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Tue, 24 May 2011 18:53:42 +0000 (11:53 -0700)]
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Unify input section names
  percpu: Avoid extra NOP in percpu_cmpxchg16b_double
  percpu: Cast away printk format warning
  percpu: Always align percpu output section to PAGE_SIZE

Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun

1  2 
arch/alpha/kernel/vmlinux.lds.S
arch/m32r/kernel/vmlinux.lds.S
arch/mips/kernel/vmlinux.lds.S
arch/parisc/kernel/vmlinux.lds.S
arch/x86/include/asm/percpu.h
arch/x86/kernel/vmlinux.lds.S
include/asm-generic/vmlinux.lds.h
kernel/workqueue.c
mm/percpu.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -509,6 -509,11 +509,11 @@@ do {                                                                     
   * it in software.  The address used in the cmpxchg16 instruction must be
   * aligned to a 16 byte boundary.
   */
+ #ifdef CONFIG_SMP
 -#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" P6_NOP3
++#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP3
+ #else
 -#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" P6_NOP2
++#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP2
+ #endif
  #define percpu_cmpxchg16b_double(pcp1, o1, o2, n1, n2)                        \
  ({                                                                    \
        char __ret;                                                     \
Simple merge
Simple merge
Simple merge
diff --cc mm/percpu.c
Simple merge