Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

* '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

diff --cc arch/alpha/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/m32r/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/mips/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/parisc/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/include/asm/percpu.h
index 53278b0dfdf660103f8f9c234b0d97691ae48611,d68fca61ad91f480778510711d5ae5c21f6c27a8..a0a9779084d16ec7b9e11b03d6435026428817dc
--- 1/arch/x86/include/asm/percpu.h
--- 2/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@@ -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.
   */
 -#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" P6_NOP3
+ #ifdef CONFIG_SMP
 -#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_NOP3
+ #else
++#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;                                                     \

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/percpu.c
Simple merge